 @@ -1,849 +1,849 @@
-/*	$NetBSD: rump.c,v 1.220 2011/01/22 13:41:22 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.221 2011/01/22 18:33:25 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.220 2011/01/22 13:41:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.221 2011/01/22 18:33:25 pooka Exp $");
 #include <sys/systm.h>
 #define ELFSIZE ARCH_ELFSIZE
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/evcnt.h>
 #include <sys/event.h>
 #include <sys/exec_elf.h>
 #include <sys/filedesc.h>
 #include <sys/iostat.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/kprintf.h>
 #include <sys/kthread.h>
 #include <sys/ksyms.h>
 #include <sys/msgbuf.h>
 #include <sys/module.h>
 #include <sys/once.h>
 #include <sys/percpu.h>
 #include <sys/pipe.h>
 #include <sys/pool.h>
 #include <sys/queue.h>
 #include <sys/reboot.h>
 #include <sys/resourcevar.h>
 #include <sys/select.h>
 #include <sys/sysctl.h>
 #include <sys/syscall.h>
 #include <sys/syscallvar.h>
 #include <sys/timetc.h>
 #include <sys/tty.h>
 #include <sys/uidinfo.h>
 #include <sys/vmem.h>
 #include <sys/xcall.h>
 #include <sys/simplelock.h>
 #include <rump/rumpuser.h>
 #include <secmodel/suser/suser.h>
 #include <prop/proplib.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_readahead.h>
 #include "rump_private.h"
 #include "rump_net_private.h"
 #include "rump_vfs_private.h"
 #include "rump_dev_private.h"
 char machine[] = MACHINE;
 struct proc *initproc;
 struct device rump_rootdev = {
 	.dv_class = DV_VIRTUAL
 };
 #ifdef RUMP_WITHOUT_THREADS
 int rump_threads = 0;
 #else
 int rump_threads = 1;
 #endif
 static int rump_proxy_syscall(int, void *, register_t *);
 static int rump_proxy_rfork(void *, int);
 static void rump_proxy_procexit(void);
 static char rump_msgbuf[16*1024]; /* 16k should be enough for std rump needs */
 #ifdef LOCKDEBUG
 const int rump_lockdebug = 1;
 #else
 const int rump_lockdebug = 0;
 #endif
 bool rump_ttycomponent = false;
 static void
 rump_aiodone_worker(struct work *wk, void *dummy)
+{
 	struct buf *bp = (struct buf *)wk;
 	KASSERT(&bp->b_work == wk);
 	bp->b_iodone(bp);
+}
 static int rump_inited;
 /*
  * Make sure pnbuf_cache is available even without vfs
  */
 struct pool_cache *pnbuf_cache;
 int rump_initpnbufpool(void);
 int rump_initpnbufpool(void)
+{
         pnbuf_cache = pool_cache_init(MAXPATHLEN, 0, 0, 0, "pnbufpl",
 	    NULL, IPL_NONE, NULL, NULL, NULL);
 	return EOPNOTSUPP;
+}
 int rump__unavailable(void);
 int rump__unavailable() {return EOPNOTSUPP;}
 __weak_alias(rump_net_init,rump__unavailable);
 __weak_alias(rump_vfs_init,rump_initpnbufpool);
 __weak_alias(rump_dev_init,rump__unavailable);
 __weak_alias(rump_vfs_fini,rump__unavailable);
 __weak_alias(biodone,rump__unavailable);
 __weak_alias(sopoll,rump__unavailable);
 __weak_alias(rump_vfs_drainbufs,rump__unavailable);
 void rump__unavailable_vfs_panic(void);
 void rump__unavailable_vfs_panic() {panic("vfs component not available");}
 __weak_alias(usermount_common_policy,rump__unavailable_vfs_panic);
 /* easier to write vfs-less clients */
 __weak_alias(rump_pub_etfs_register,rump__unavailable);
 __weak_alias(rump_pub_etfs_remove,rump__unavailable);
 rump_proc_vfs_init_fn rump_proc_vfs_init;
 rump_proc_vfs_release_fn rump_proc_vfs_release;
 static void add_linkedin_modules(const struct modinfo *const *, size_t);
 static void __noinline
 messthestack(void)
+{
 	volatile uint32_t mess[64];
 	uint64_t d1, d2;
 	int i, error;
 	for (i = 0; i < 64; i++) {
 		rumpuser_gettime(&d1, &d2, &error);
 		mess[i] = d2;
+	}
+}
 /*
  * Create kern.hostname.  why only this you ask.  well, init_sysctl
  * is a kitchen sink in need of some gardening.  but i want to use
  * kern.hostname today.
  */
 static void
 mksysctls(void)
+{
 	sysctl_createv(NULL, 0, NULL, NULL,
 	    CTLFLAG_PERMANENT, CTLTYPE_NODE, "kern", NULL,
 	    NULL, 0, NULL, 0, CTL_KERN, CTL_EOL);
 	/* XXX: setting hostnamelen is missing */
 	sysctl_createv(NULL, 0, NULL, NULL,
 	    CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_STRING, "hostname",
 	    SYSCTL_DESCR("System hostname"), NULL, 0,
 	    &hostname, MAXHOSTNAMELEN, CTL_KERN, KERN_HOSTNAME, CTL_EOL);
+}
 /* there's no convenient kernel entry point for this, so just craft out own */
 static pid_t
 spgetpid(void)
+{
 	return curproc->p_pid;
+}
 static const struct rumpuser_sp_ops spops = {
 	.spop_schedule		= rump_schedule,
 	.spop_unschedule	= rump_unschedule,
 	.spop_lwproc_switch	= rump_lwproc_switch,
 	.spop_lwproc_release	= rump_lwproc_releaselwp,
 	.spop_lwproc_rfork	= rump_proxy_rfork,
 	.spop_lwproc_newlwp	= rump_lwproc_newlwp,
 	.spop_lwproc_curlwp	= rump_lwproc_curlwp,
 	.spop_procexit		= rump_proxy_procexit,
 	.spop_syscall		= rump_proxy_syscall,
 	.spop_getpid		= spgetpid,
 };
 int
 rump_daemonize_begin(void)
+{
 	if (rump_inited)
 		return EALREADY;
 	return rumpuser_daemonize_begin();
+}
 int
 rump_daemonize_done(int error)
+{
 	return rumpuser_daemonize_done(error);
+}
 int
 rump__init(int rump_version)
+{
 	char buf[256];
 	struct timespec ts;
 	uint64_t sec, nsec;
 	struct lwp *l;
 	int i, numcpu;
 	int error;
 	/* not reentrant */
 	if (rump_inited)
 		return 0;
 	else if (rump_inited == -1)
 		panic("rump_init: host process restart required");
 	else
 		rump_inited = 1;
 	if (rumpuser_getversion() != RUMPUSER_VERSION) {
 		/* let's hope the ABI of rumpuser_dprintf is the same ;) */
 		rumpuser_dprintf("rumpuser version mismatch: %d vs. %d\n",
 		    rumpuser_getversion(), RUMPUSER_VERSION);
 		return EPROGMISMATCH;
+	}
 	if (rumpuser_getenv("RUMP_VERBOSE", buf, sizeof(buf), &error) == 0) {
 		if (*buf != '0')
 			boothowto = AB_VERBOSE;
+	}
 	if (rumpuser_getenv("RUMP_NCPU", buf, sizeof(buf), &error) == 0)
 		error = 0;
 	if (error == 0) {
 		numcpu = strtoll(buf, NULL, 10);
 		if (numcpu < 1)
 			numcpu = 1;
 	} else {
 		numcpu = rumpuser_getnhostcpu();
+	}
 	rump_cpus_bootstrap(&numcpu);
 	rumpuser_gettime(&sec, &nsec, &error);
 	boottime.tv_sec = sec;
 	boottime.tv_nsec = nsec;
 	initmsgbuf(rump_msgbuf, sizeof(rump_msgbuf));
 	aprint_verbose("%s%s", copyright, version);
 	/*
 	 * Seed arc4random() with a "reasonable" amount of randomness.
 	 * Yes, this is a quick kludge which depends on the arc4random
 	 * implementation.
 	 */
 	messthestack();
 	arc4random();
 	if (rump_version != RUMP_VERSION) {
 		printf("rump version mismatch, %d vs. %d\n",
 		    rump_version, RUMP_VERSION);
 		return EPROGMISMATCH;
+	}
 	if (rumpuser_getenv("RUMP_THREADS", buf, sizeof(buf), &error) == 0) {
 		rump_threads = *buf != '0';
+	}
 	rumpuser_thrinit(rump_user_schedule, rump_user_unschedule,
 	    rump_threads);
 	rump_intr_init(numcpu);
 	rump_tsleep_init();
 	/* init minimal lwp/cpu context */
 	l = &lwp0;
 	l->l_lid = 1;
 	l->l_cpu = l->l_target_cpu = rump_cpu;
 	l->l_fd = &filedesc0;
 	rumpuser_set_curlwp(l);
 	rumpuser_mutex_init(&rump_giantlock);
 	ksyms_init();
 	uvm_init();
 	evcnt_init();
 	once_init();
 	kernconfig_lock_init();
 	prop_kern_init();
 	pool_subsystem_init();
 	kmem_init();
 	uvm_ra_init();
 	uao_init();
 	mutex_obj_init();
 	callout_startup();
 	kprintf_init();
 	loginit();
 	kauth_init();
 	procinit();
 	proc0_init();
 	uid_init();
 	chgproccnt(0, 1);
 	l->l_proc = &proc0;
 	lwp_update_creds(l);
 	lwpinit_specificdata();
 	lwp_initspecific(&lwp0);
 	rump_scheduler_init(numcpu);
 	/* revert temporary context and schedule a semireal context */
 	l->l_cpu = NULL;
 	rumpuser_set_curlwp(NULL);
 	initproc = &proc0; /* borrow proc0 before we get initproc started */
 	rump_schedule();
 	percpu_init();
 	inittimecounter();
 	ntp_init();
 	rumpuser_gettime(&sec, &nsec, &error);
 	ts.tv_sec = sec;
 	ts.tv_nsec = nsec;
 	tc_setclock(&ts);
 	/* we are mostly go.  do per-cpu subsystem init */
 	for (i = 0; i < numcpu; i++) {
 		struct cpu_info *ci = cpu_lookup(i);
 		/* attach non-bootstrap CPUs */
 		if (i > 0) {
 			rump_cpu_attach(ci);
 			ncpu++;
+		}
 		callout_init_cpu(ci);
 		softint_init(ci);
 		xc_init_cpu(ci);
 		pool_cache_cpu_init(ci);
 		selsysinit(ci);
 		percpu_init_cpu(ci);
 		TAILQ_INIT(&ci->ci_data.cpu_ld_locks);
 		__cpu_simple_lock_init(&ci->ci_data.cpu_ld_lock);
 		aprint_verbose("cpu%d at thinair0: rump virtual cpu\n", i);
+	}
 	sysctl_init();
 	mksysctls();
 	kqueue_init();
 	iostat_init();
 	fd_sys_init();
 	module_init();
 	devsw_init();
 	pipe_init();
 	resource_init();
 	/* start page baroness */
 	if (rump_threads) {
 		if (kthread_create(PRI_PGDAEMON, KTHREAD_MPSAFE, NULL,
 		    uvm_pageout, NULL, &uvm.pagedaemon_lwp, "pdaemon") != 0)
 			panic("pagedaemon create failed");
 	} else
 		uvm.pagedaemon_lwp = NULL; /* doesn't match curlwp */
 	/* process dso's */
 	rumpuser_dl_bootstrap(add_linkedin_modules, rump_kernelfsym_load);
 	rump_component_init(RUMP_COMPONENT_KERN);
 	/* these do nothing if not present */
 	rump_vfs_init();
 	rump_net_init();
 	rump_dev_init();
 	rump_component_init(RUMP_COMPONENT_KERN_VFS);
 	/*
 	 * if we initialized the tty component above, the tyttymtx is
 	 * now initialized.  otherwise, we need to initialize it.
 	 */
 	if (!rump_ttycomponent)
 		mutex_init(&tty_lock, MUTEX_DEFAULT, IPL_VM);
 	cold = 0;
 	/* aieeeedondest */
 	if (rump_threads) {
 		if (workqueue_create(&uvm.aiodone_queue, "aiodoned",
 		    rump_aiodone_worker, NULL, 0, 0, WQ_MPSAFE))
 			panic("aiodoned");
+	}
 	sysctl_finalize();
 	module_init_class(MODULE_CLASS_ANY);
 	rumpuser_gethostname(hostname, MAXHOSTNAMELEN, &error);
 	hostnamelen = strlen(hostname);
 	sigemptyset(&sigcantmask);
 	if (rump_threads)
 		vmem_rehash_start();
 	/*
 	 * Create init, used to attach implicit threads in rump.
 	 * (note: must be done after vfsinit to get cwdi)
 	 */
 	(void)rump__lwproc_alloclwp(NULL); /* dummy thread for initproc */
 	mutex_enter(proc_lock);
 	initproc = proc_find_raw(1);
 	mutex_exit(proc_lock);
 	if (initproc == NULL)
 		panic("where in the world is initproc?");
 	/*
 	 * Adjust syscall vector in case factions were dlopen()'d
 	 * before calling rump_init().
 	 * (modules will handle dynamic syscalls the usual way)
+	 *
 	 * Note: this will adjust the function vectors of
 	 * syscalls which use a funcalias (getpid etc.), but
 	 * it makes no difference.
 	 */
 	for (i = 0; i < SYS_NSYSENT; i++) {
 		void *sym;
 		if (rump_sysent[i].sy_flags & SYCALL_NOSYS ||
 		    *syscallnames[i] == '#' ||
 		    rump_sysent[i].sy_call == sys_nomodule)
 			continue;
 		/* if present, adjust symbol value */
 		sprintf(buf, "rumpns_sys_%s", syscallnames[i]);
 		if ((sym = rumpuser_dl_globalsym(buf)) != NULL
 		    && sym != rump_sysent[i].sy_call) {
 #if 0
 			rumpuser_dprintf("adjusting %s: %p (old %p)\n",
 			    syscallnames[i], sym, rump_sysent[i].sy_call);
 #endif
 			rump_sysent[i].sy_call = sym;
+		}
+	}
 	/* release cpu */
 	rump_unschedule();
 	return 0;
+}
 int
 rump_init_server(const char *url)
+{
 	return rumpuser_sp_init(url, &spops, ostype, osrelease, MACHINE);
+}
 void
 cpu_reboot(int howto, char *bootstr)
+{
 	int ruhow = 0;
 	void *finiarg;
 	printf("rump kernel halting...\n");
 	if (!RUMP_LOCALPROC_P(curproc))
 		finiarg = curproc->p_vmspace->vm_map.pmap;
 	else
 		finiarg = NULL;
 	rumpuser_sp_fini(finiarg);
 	/* dump means we really take the dive here */
 	if ((howto & RB_DUMP) || panicstr) {
 		ruhow = RUMPUSER_PANIC;
 		goto out;
+	}
 	/* try to sync */
 	if (!((howto & RB_NOSYNC) || panicstr)) {
 		rump_vfs_fini();
+	}
 	/* your wish is my command */
 	if (howto & RB_HALT) {
 		printf("rump kernel halted\n");
 		for (;;) {
 			uint64_t sec = 5, nsec = 0;
 			int error;
 			rumpuser_nanosleep(&sec, &nsec, &error);
+		}
+	}
 	/* this function is __dead, we must exit */
  out:
 	printf("halted\n");
 	rumpuser_exit(ruhow);
+}
 struct uio *
 rump_uio_setup(void *buf, size_t bufsize, off_t offset, enum rump_uiorw rw)
+{
 	struct uio *uio;
 	enum uio_rw uiorw;
 	switch (rw) {
 	case RUMPUIO_READ:
 		uiorw = UIO_READ;
 		break;
 	case RUMPUIO_WRITE:
 		uiorw = UIO_WRITE;
 		break;
 	default:
 		panic("%s: invalid rw %d", __func__, rw);
+	}
 	uio = kmem_alloc(sizeof(struct uio), KM_SLEEP);
 	uio->uio_iov = kmem_alloc(sizeof(struct iovec), KM_SLEEP);
 	uio->uio_iov->iov_base = buf;
 	uio->uio_iov->iov_len = bufsize;
 	uio->uio_iovcnt = 1;
 	uio->uio_offset = offset;
 	uio->uio_resid = bufsize;
 	uio->uio_rw = uiorw;
 	UIO_SETUP_SYSSPACE(uio);
 	return uio;
+}
 size_t
 rump_uio_getresid(struct uio *uio)
+{
 	return uio->uio_resid;
+}
 off_t
 rump_uio_getoff(struct uio *uio)
+{
 	return uio->uio_offset;
+}
 size_t
 rump_uio_free(struct uio *uio)
+{
 	size_t resid;
 	resid = uio->uio_resid;
 	kmem_free(uio->uio_iov, sizeof(*uio->uio_iov));
 	kmem_free(uio, sizeof(*uio));
 	return resid;
+}
 kauth_cred_t
 rump_cred_create(uid_t uid, gid_t gid, size_t ngroups, gid_t *groups)
+{
 	kauth_cred_t cred;
 	int rv;
 	cred = kauth_cred_alloc();
 	kauth_cred_setuid(cred, uid);
 	kauth_cred_seteuid(cred, uid);
 	kauth_cred_setsvuid(cred, uid);
 	kauth_cred_setgid(cred, gid);
 	kauth_cred_setgid(cred, gid);
 	kauth_cred_setegid(cred, gid);
 	kauth_cred_setsvgid(cred, gid);
 	rv = kauth_cred_setgroups(cred, groups, ngroups, 0, UIO_SYSSPACE);
 	/* oh this is silly.  and by "this" I mean kauth_cred_setgroups() */
 	assert(rv == 0);
 	return cred;
+}
 void
 rump_cred_put(kauth_cred_t cred)
+{
 	kauth_cred_free(cred);
+}
 static int compcounter[RUMP_COMPONENT_MAX];
 static void
 rump_component_init_cb(struct rump_component *rc, int type)
+{
 	KASSERT(type < RUMP_COMPONENT_MAX);
 	if (rc->rc_type == type) {
 		rc->rc_init();
 		compcounter[type]++;
+	}
+}
 int
 rump_component_count(enum rump_component_type type)
+{
 	KASSERT(type <= RUMP_COMPONENT_MAX);
 	return compcounter[type];
+}
 void
 rump_component_init(enum rump_component_type type)
+{
 	rumpuser_dl_component_init(type, rump_component_init_cb);
+}
 /*
  * Initialize a module which has already been loaded and linked
  * with dlopen(). This is fundamentally the same as a builtin module.
  */
 int
 rump_module_init(const struct modinfo * const *mip, size_t nmodinfo)
+{
 	return module_builtin_add(mip, nmodinfo, true);
+}
 /*
  * Finish module (flawless victory, fatality!).
  */
 int
 rump_module_fini(const struct modinfo *mi)
+{
 	return module_builtin_remove(mi, true);
+}
 /*
  * Add loaded and linked module to the builtin list.  It will
  * later be initialized with module_init_class().
  */
 static void
 add_linkedin_modules(const struct modinfo * const *mip, size_t nmodinfo)
+{
 	module_builtin_add(mip, nmodinfo, false);
+}
 int
 rump_kernelfsym_load(void *symtab, uint64_t symsize,
 	char *strtab, uint64_t strsize)
+{
 	static int inited = 0;
 	Elf64_Ehdr ehdr;
 	if (inited)
 		return EBUSY;
 	inited = 1;
 	/*
 	 * Use 64bit header since it's bigger.  Shouldn't make a
 	 * difference, since we're passing in all zeroes anyway.
 	 */
 	memset(&ehdr, 0, sizeof(ehdr));
 	ksyms_addsyms_explicit(&ehdr, symtab, symsize, strtab, strsize);
 	return 0;
+}
 static int
 rump_proxy_syscall(int num, void *arg, register_t *retval)
+{
 	struct lwp *l;
 	struct sysent *callp;
 	int rv;
 	if (__predict_false(num >= SYS_NSYSENT))
 		return ENOSYS;
 	callp = rump_sysent + num;
 	l = curlwp;
 	rv = sy_call(callp, l, (void *)arg, retval);
 	return rv;
+}
 static int
 rump_proxy_rfork(void *priv, int flags)
+{
 	struct vmspace *newspace;
 	int error;
 	if ((error = rump_lwproc_rfork(flags)) != 0)
 		return error;
 	/*
 	 * Since it's a proxy proc, adjust the vmspace.
 	 * Refcount will eternally be 1.
 	 */
 	newspace = kmem_alloc(sizeof(*newspace), KM_SLEEP);
 	newspace->vm_refcnt = 1;
 	newspace->vm_map.pmap = priv;
 	KASSERT(curproc->p_vmspace == vmspace_kernel());
 	curproc->p_vmspace = newspace;
 	return 0;
+}
 static void
 rump_proxy_procexit(void)
+{
 	struct proc *p = curproc;
 	uint64_t where;
 	struct lwp *l;
 	mutex_enter(p->p_lock);
 	/*
 	 * First pass: mark all lwps in the process with LSDEAD
 	 * so that they know they should exit.
 	 */
 	LIST_FOREACH(l, &p->p_lwps, l_sibling) {
 		if (l == curlwp)
 			continue;
 		l->l_stat = LSDEAD;
+	}
 	mutex_exit(p->p_lock);
 	/*
 	 * Next, make sure everyone on all CPUs sees our status
 	 * update.  This keeps threads inside cv_wait() and makes
 	 * sure we don't access a stale cv pointer later when
 	 * we wake up the threads.
 	 */
 	where = xc_broadcast(0, (xcfunc_t)nullop, NULL, NULL);
 	xc_wait(where);
 	/*
 	 * Ok, all lwps are either:
 	 *  1) not in the cv code
 	 *  2) sleeping on l->l_private
 	 *  3) sleeping on p->p_waitcv
+	 *
 	 * Either way, l_private is stable until we change the lwps
 	 * state to LSZOMB.
 	 */
 	mutex_enter(p->p_lock);
 	LIST_FOREACH(l, &p->p_lwps, l_sibling) {
 		if (l->l_private)
 			cv_broadcast(l->l_private);
 		l->l_stat = LSZOMB;
+	}
 	cv_broadcast(&p->p_waitcv);
 	mutex_exit(p->p_lock);
 	/*
 	 * Don't wait for lwps to exit.  There's refcounting in the
 	 * rumpuser sp code which makes this safe.  Also, this routine
-	 * should sleep for a long time.
+	 * should not sleep for a long time.
 	 */
+}
 int
 rump_boot_gethowto()
+{
 	return boothowto;
+}
 void
 rump_boot_sethowto(int howto)
+{
 	boothowto = howto;
+}
 int
 rump_getversion(void)
+{
 	return __NetBSD_Version__;
+}
 /*
  * Note: may be called unscheduled.  Not fully safe since no locking
  * of allevents (currently that's not even available).
  */
 void
 rump_printevcnts()
+{
 	struct evcnt *ev;
 	TAILQ_FOREACH(ev, &allevents, ev_list)
 		rumpuser_dprintf("%s / %s: %" PRIu64 "\n",
 		    ev->ev_group, ev->ev_name, ev->ev_count);
+}
 /*
  * If you use this interface ... well ... all bets are off.
  * The original purpose is for the p2k fs server library to be
  * able to use the same pid/lid for VOPs as the host kernel.
  */
 void
 rump_allbetsareoff_setid(pid_t pid, int lid)
+{
 	struct lwp *l = curlwp;
 	struct proc *p = l->l_proc;
 	l->l_lid = lid;
 	p->p_pid = pid;
+}