[src/trunk]: src/sys/rump/librump/rumpkern Realize the >1yo comment above rum...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d89fd2a79d36
branches:  trunk
changeset: 758921:d89fd2a79d36
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Nov 21 17:34:11 2010 +0000

description:
Realize the >1yo comment above rump_reboot and retire them to make
room for sys_reboot.

diffstat:

 sys/rump/librump/rumpkern/Makefile.rumpkern |   3 ++-
 sys/rump/librump/rumpkern/emul.c            |  28 ++++++++++++++++------------
 sys/rump/librump/rumpkern/rump.c            |  12 +++++++-----
 sys/rump/librump/rumpkern/rumpkern.ifspec   |   3 +--
 4 files changed, 26 insertions(+), 20 deletions(-)

diffs (135 lines):

diff -r a8cb507cdf3f -r d89fd2a79d36 sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Nov 21 17:05:52 2010 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Nov 21 17:34:11 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.98 2010/10/27 20:37:11 pooka Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.99 2010/11/21 17:34:11 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -68,6 +68,7 @@
        kern_tc.c               \
        kern_timeout.c          \
        kern_uidinfo.c          \
+       kern_xxx.c              \
        param.c                 \
        subr_devsw.c            \
        subr_callback.c         \
diff -r a8cb507cdf3f -r d89fd2a79d36 sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Sun Nov 21 17:05:52 2010 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Sun Nov 21 17:34:11 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emul.c,v 1.146 2010/10/15 15:55:53 tsutsui Exp $       */
+/*     $NetBSD: emul.c,v 1.147 2010/11/21 17:34:11 pooka Exp $ */
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.146 2010/10/15 15:55:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.147 2010/11/21 17:34:11 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/null.h>
@@ -263,16 +263,6 @@
        /* done */
 }
 
-void
-cpu_reboot(int howto, char *bootstr)
-{
-
-       rump_reboot(howto);
-
-       /* this function is __dead, we must exit */
-       rumpuser_exit(0);
-}
-
 #ifdef __HAVE_SYSCALL_INTERN
 void
 syscall_intern(struct proc *p)
@@ -289,3 +279,17 @@
        /* I'll think about the implementation if this is ever used */
        panic("not implemented");
 }
+
+int
+trace_enter(register_t code, const register_t *args, int narg)
+{
+
+       return 0;
+}
+
+void
+trace_exit(register_t code, register_t rval[], int error)
+{
+
+       /* nada */
+}
diff -r a8cb507cdf3f -r d89fd2a79d36 sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c  Sun Nov 21 17:05:52 2010 +0000
+++ b/sys/rump/librump/rumpkern/rump.c  Sun Nov 21 17:34:11 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump.c,v 1.202 2010/11/19 17:11:20 pooka Exp $ */
+/*     $NetBSD: rump.c,v 1.203 2010/11/21 17:34:11 pooka Exp $ */
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.202 2010/11/19 17:11:20 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.203 2010/11/21 17:34:11 pooka Exp $");
 
 #include <sys/systm.h>
 #define ELFSIZE ARCH_ELFSIZE
@@ -439,9 +439,8 @@
        return 0;
 }
 
-/* maybe support sys_reboot some day for remote shutdown */
 void
-rump_reboot(int howto)
+cpu_reboot(int howto, char *bootstr)
 {
 
        /* dump means we really take the dive here */
@@ -457,6 +456,7 @@
 
        /* your wish is my command */
        if (howto & RB_HALT) {
+               printf("rump kernel halted\n");
                for (;;) {
                        uint64_t sec = 5, nsec = 0;
                        int error;
@@ -464,7 +464,9 @@
                        rumpuser_nanosleep(&sec, &nsec, &error);
                }
        }
-       rump_inited = -1;
+
+       /* this function is __dead, we must exit */
+       rumpuser_exit(0);
 }
 
 struct uio *
diff -r a8cb507cdf3f -r d89fd2a79d36 sys/rump/librump/rumpkern/rumpkern.ifspec
--- a/sys/rump/librump/rumpkern/rumpkern.ifspec Sun Nov 21 17:05:52 2010 +0000
+++ b/sys/rump/librump/rumpkern/rumpkern.ifspec Sun Nov 21 17:34:11 2010 +0000
@@ -1,4 +1,4 @@
-;      $NetBSD: rumpkern.ifspec,v 1.8 2010/11/17 21:49:52 pooka Exp $
+;      $NetBSD: rumpkern.ifspec,v 1.9 2010/11/21 17:34:11 pooka Exp $
 
 NAME|kern
 PUBHDR|include/rump/rumpkern_if_pub.h
@@ -8,7 +8,6 @@
 ; type         | name          | args
 ;
 
-void           |reboot         |int
 int            |getversion     |void
 
 int            |module_init    |const struct modinfo * const *, size_t