 @@ -1,14 +1,14 @@
-/*      $NetBSD: rumpuser_sp.c,v 1.36 2011/01/14 13:12:14 pooka Exp $	*/
+/*      $NetBSD: rumpuser_sp.c,v 1.37 2011/01/22 13:41:22 pooka Exp $	*/
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
+ *
  * 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.
+ *
 @@ -25,27 +25,27 @@
  * SUCH DAMAGE.
  */
 /*
  * Sysproxy routines.  This provides system RPC support over host sockets.
  * The most notable limitation is that the client and server must share
  * the same ABI.  This does not mean that they have to be the same
  * machine or that they need to run the same version of the host OS,
  * just that they must agree on the data structures.  This even *might*
  * work correctly from one hardware architecture to another.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: rumpuser_sp.c,v 1.36 2011/01/14 13:12:14 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_sp.c,v 1.37 2011/01/22 13:41:22 pooka Exp $");
 #include <sys/types.h>
 #include <sys/atomic.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 @@ -574,27 +574,29 @@ serv_handleconn(int fd, connecthook_fn c
+}
 static void
 serv_handlesyscall(struct spclient *spc, struct rsp_hdr *rhdr, uint8_t *data)
+{
 	register_t retval[2] = {0, 0};
 	int rv, sysnum;
 	sysnum = (int)rhdr->rsp_sysnum;
 	DPRINTF(("rump_sp: handling syscall %d from client %d\n",
 	    sysnum, spc->spc_pid));
 	lwproc_newlwp(spc->spc_pid);
 	spc->spc_syscallreq = rhdr->rsp_reqno;
 	rv = rumpsyscall(sysnum, data, retval);
 	spc->spc_syscallreq = 0;
 	lwproc_release();
 	DPRINTF(("rump_sp: got return value %d & %d/%d\n",
 	    rv, retval[0], retval[1]));
 	send_syscall_resp(spc, rhdr->rsp_reqno, rv, retval);
+}
 struct sysbouncearg {
 	struct spclient *sba_spc;
 	struct rsp_hdr sba_hdr;
 	uint8_t *sba_data;
 @@ -1133,22 +1135,31 @@ rumpuser_sp_init(const char *url, const
 		return errno;
+	}
 	if ((error = pthread_create(&pt, NULL, spserver, sarg)) != 0) {
 		fprintf(stderr, "rump_sp: cannot create wrkr thread\n");
 		return errno;
+	}
 	pthread_detach(pt);
 	return 0;
+}
 void
-rumpuser_sp_fini()
+rumpuser_sp_fini(void *arg)
+{
 	struct spclient *spc = arg;
 	register_t retval[2] = {0, 0};
 	/*
 	 * stuff response into the socket, since this process is just
 	 * about to exit
 	 */
 	if (spc && spc->spc_syscallreq)
 		send_syscall_resp(spc, spc->spc_syscallreq, 0, retval);
 	if (spclist[0].spc_fd) {
 		parsetab[cleanupidx].cleanup(cleanupsa);
 		shutdown(spclist[0].spc_fd, SHUT_RDWR);
 		spfini = 1;
+	}
+}

 @@ -1,14 +1,14 @@
-/*      $NetBSD: sp_common.c,v 1.24 2011/01/14 13:12:14 pooka Exp $	*/
+/*      $NetBSD: sp_common.c,v 1.25 2011/01/22 13:41:22 pooka Exp $	*/
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
+ *
  * 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.
+ *
 @@ -166,26 +166,27 @@ struct spclient {
 	pid_t spc_pid;
 	TAILQ_HEAD(, respwait) spc_respwait;
 	/* rest of the fields are zeroed upon disconnect */
 #define SPC_ZEROFF offsetof(struct spclient, spc_pfd)
 	struct pollfd *spc_pfd;
 	struct rsp_hdr spc_hdr;
 	uint8_t *spc_buf;
 	size_t spc_off;
 	uint64_t spc_nextreq;
 	uint64_t spc_syscallreq;
 	int spc_ostatus, spc_istatus;
 	LIST_HEAD(, prefork) spc_pflist;
 };
 #define SPCSTATUS_FREE 0
 #define SPCSTATUS_BUSY 1
 #define SPCSTATUS_WANTED 2
 #define SPCSTATE_NEW     0
 #define SPCSTATE_RUNNING 1
 #define SPCSTATE_DYING   2
 typedef int (*addrparse_fn)(const char *, struct sockaddr **, int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rumpuser.h,v 1.63 2011/01/14 13:11:08 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.64 2011/01/22 13:41:22 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
 @@ -26,27 +26,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef _RUMP_RUMPUSER_H_
 #define _RUMP_RUMPUSER_H_
 #ifdef _KERNEL
 #include <sys/stdint.h>
 #else
 #include <stdint.h>
 #endif
-#define RUMPUSER_VERSION 10
+#define RUMPUSER_VERSION 11
 int rumpuser_getversion(void);
 int rumpuser_daemonize_begin(void);
 int rumpuser_daemonize_done(int);
 struct msghdr;
 struct pollfd;
 struct sockaddr;
 typedef void (*kernel_lockfn)(int, void *);
 typedef void (*kernel_unlockfn)(int, int *, void *);
 int rumpuser_getfileinfo(const char *, uint64_t *, int *, int *);
 @@ -220,16 +220,16 @@ struct rumpuser_sp_ops {
 	int (*spop_syscall)(int, void *, register_t *);
 	void (*spop_procexit)(void);
 	pid_t (*spop_getpid)(void);
 };
 int	rumpuser_sp_init(const char *, const struct rumpuser_sp_ops *,
 			 const char *, const char *, const char *);
 int	rumpuser_sp_copyin(void *, const void *, void *, size_t);
 int	rumpuser_sp_copyinstr(void *, const void *, void *, size_t *);
 int	rumpuser_sp_copyout(void *, const void *, void *, size_t);
 int	rumpuser_sp_copyoutstr(void *, const void *, void *, size_t *);
 int	rumpuser_sp_anonmmap(void *, size_t, void **);
 int	rumpuser_sp_raise(void *, int);
-void	rumpuser_sp_fini(void);
+void	rumpuser_sp_fini(void *);
 #endif /* _RUMP_RUMPUSER_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump.c,v 1.219 2011/01/12 12:51:21 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.220 2011/01/22 13:41:22 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
 @@ -18,27 +18,27 @@
  * 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.219 2011/01/12 12:51:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.220 2011/01/22 13:41:22 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>
 @@ -488,29 +488,35 @@ rump__init(int rump_version)
+}
 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");
 	rumpuser_sp_fini();
 	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 */