Module Name: src
Committed By: pooka
Date: Sun Nov 21 17:34:11 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern emul.c rump.c
rumpkern.ifspec
Log Message:
Realize the >1yo comment above rump_reboot and retire them to make
room for sys_reboot.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.146 -r1.147 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.202 -r1.203 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpkern/rumpkern.ifspec
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.98 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.99
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.98 Wed Oct 27 20:37:11 2010
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Nov 21 17:34:11 2010
@@ -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 \
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.146 src/sys/rump/librump/rumpkern/emul.c:1.147
--- src/sys/rump/librump/rumpkern/emul.c:1.146 Fri Oct 15 15:55:53 2010
+++ src/sys/rump/librump/rumpkern/emul.c Sun Nov 21 17:34:11 2010
@@ -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 */
+}
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.202 src/sys/rump/librump/rumpkern/rump.c:1.203
--- src/sys/rump/librump/rumpkern/rump.c:1.202 Fri Nov 19 17:11:20 2010
+++ src/sys/rump/librump/rumpkern/rump.c Sun Nov 21 17:34:11 2010
@@ -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 *
Index: src/sys/rump/librump/rumpkern/rumpkern.ifspec
diff -u src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.8 src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.9
--- src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.8 Wed Nov 17 21:49:52 2010
+++ src/sys/rump/librump/rumpkern/rumpkern.ifspec Sun Nov 21 17:34:11 2010
@@ -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
