Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Realize the >1yo comment above rump_reboot and retire them to make

Browse Source 
room for sys_reboot.
This commit is contained in:
pooka 2010-11-21 17:34:11 +00:00
parent 264ec8a849
commit 15e3ba0cc7
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/rump/librump/rumpkern/Makefile.rumpkern
View File

@ -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" .include "${RUMPTOP}/Makefile.rump"
@ -68,6 +68,7 @@ SRCS+= init_sysctl_base.c \
kern_tc.c \ kern_tc.c \
kern_timeout.c \ kern_timeout.c \
kern_uidinfo.c \ kern_uidinfo.c \
kern_xxx.c \
param.c \ param.c \
subr_devsw.c \ subr_devsw.c \
subr_callback.c \ subr_callback.c \

28
sys/rump/librump/rumpkern/emul.c
View File

@ -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. * Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@ -28,7 +28,7 @@
*/ */
#include <sys/cdefs.h> #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/param.h>
#include <sys/null.h> #include <sys/null.h>
@ -263,16 +263,6 @@ cnflush(void)
/* done */ /* 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 #ifdef __HAVE_SYSCALL_INTERN
void void
syscall_intern(struct proc *p) syscall_intern(struct proc *p)
@ -289,3 +279,17 @@ xc_send_ipi(struct cpu_info *ci)
/* I'll think about the implementation if this is ever used */ /* I'll think about the implementation if this is ever used */
panic("not implemented"); 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 */
}

12
sys/rump/librump/rumpkern/rump.c
View File

@ -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. * Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@ -28,7 +28,7 @@
*/ */
#include <sys/cdefs.h> #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> #include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE #define ELFSIZE ARCH_ELFSIZE
@ -439,9 +439,8 @@ rump__init(int rump_version)
return 0; return 0;
} }
/* maybe support sys_reboot some day for remote shutdown */
void void
rump_reboot(int howto) cpu_reboot(int howto, char *bootstr)
{ {
/* dump means we really take the dive here */ /* dump means we really take the dive here */
@ -457,6 +456,7 @@ rump_reboot(int howto)
/* your wish is my command */ /* your wish is my command */
if (howto & RB_HALT) { if (howto & RB_HALT) {
printf("rump kernel halted\n");
for (;;) { for (;;) {
uint64_t sec = 5, nsec = 0; uint64_t sec = 5, nsec = 0;
int error; int error;
@ -464,7 +464,9 @@ rump_reboot(int howto)
rumpuser_nanosleep(&sec, &nsec, &error); rumpuser_nanosleep(&sec, &nsec, &error);
} }
} }
rump_inited = -1;
/* this function is __dead, we must exit */
rumpuser_exit(0);
} }
struct uio * struct uio *

3
sys/rump/librump/rumpkern/rumpkern.ifspec
View File

@ -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 NAME|kern
PUBHDR|include/rump/rumpkern_if_pub.h PUBHDR|include/rump/rumpkern_if_pub.h
@ -8,7 +8,6 @@ WRAPPERS|librump/rumpkern/rumpkern_if_wrappers.c
; type | name | args ; type | name | args
; ;
void |reboot |int
int |getversion |void int |getversion |void
int |module_init |const struct modinfo * const *, size_t int |module_init |const struct modinfo * const *, size_t