 @@ -1,14 +1,14 @@
-/*	$NetBSD: ukfs.c,v 1.25 2009/05/02 01:15:52 pooka Exp $	*/
+/*	$NetBSD: ukfs.c,v 1.26 2009/05/02 15:20:08 pooka Exp $	*/
 /*
  * Copyright (c) 2007, 2008  Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural Foundation.
+ *
  * 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
 @@ -665,46 +665,47 @@ ukfs_lutimes(struct ukfs *ukfs, const ch
  * Dynamic module support
  */
 /* load one library */
 /*
  * XXX: the dlerror stuff isn't really threadsafe, but then again I
  * can't protect against other threads calling dl*() outside of ukfs,
  * so just live with it being flimsy
  */
 int
 ukfs_modload(const char *fname)
+{
-	void *handle, *thesym;
+	void *handle;
 	struct modinfo **mi;
 	struct stat sb;
 	int error;
 	if (stat(fname, &sb) == -1)
 		return -1;
 	handle = dlopen(fname, RTLD_GLOBAL);
 	if (handle == NULL) {
 		const char *dlmsg = dlerror();
 		if (strstr(dlmsg, "Undefined symbol"))
 			return 0;
 		warnx("dlopen %s failed: %s\n", fname, dlmsg);
 		/* XXXerrno */
 		return -1;
+	}
-	thesym = dlsym(handle, "__start_link_set_modules");
+	mi = dlsym(handle, "__start_link_set_modules");
-	if (thesym) {
+	if (mi) {
-		error = rump_module_load(thesym);
+		error = rump_module_init(*mi, NULL);
 		if (error)
 			goto errclose;
 		return 1;
+	}
 	error = EINVAL;
  errclose:
 	dlclose(handle);
 	errno = error;
 	return -1;
+}
 struct loadfail {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump.h,v 1.13 2009/04/29 18:00:49 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.14 2009/05/02 15:20:08 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
 @@ -33,48 +33,56 @@
 /*
  * NOTE: do not #include anything from <sys> here.  Otherwise this
  * has no chance of working on non-NetBSD platforms.
  */
 struct mount;
 struct vnode;
 struct vattr;
 struct componentname;
 struct vfsops;
 struct fid;
 struct statvfs;
 /* yetch */
 #if !defined(_RUMPKERNEL) && !defined(__NetBSD__)
 struct kauth_cred;
 typedef struct kauth_cred *kauth_cred_t;
 #endif
 #if defined(__NetBSD__)
 #include <prop/proplib.h>
 #else
 struct prop_dictionary;
 typedef struct prop_dictionary *prop_dictionary_t;
 #endif /* __NetBSD__ */
 struct lwp;
 struct modinfo;
 #include <rump/rumpvnode_if.h>
 #include <rump/rumpdefs.h>
 #ifndef curlwp
 #define curlwp rump_get_curlwp()
 #endif
 /*
  * Something like rump capabilities would be nicer, but let's
  * do this for a start.
  */
 #define RUMP_VERSION	01
 #define rump_init()	rump__init(RUMP_VERSION)
-int	rump_module_load(struct modinfo **);
+int	rump_module_init(struct modinfo *, prop_dictionary_t props);
 int	rump_module_fini(struct modinfo *);
 int		rump__init(int);
 struct mount	*rump_mnt_init(struct vfsops *, int);
 int		rump_mnt_mount(struct mount *, const char *, void *, size_t *);
 void		rump_mnt_destroy(struct mount *);
 struct componentname	*rump_makecn(u_long, u_long, const char *, size_t,
 				     kauth_cred_t, struct lwp *);
 void			rump_freecn(struct componentname *, int);
 #define RUMPCN_ISLOOKUP 0x01
 #define RUMPCN_FREECRED 0x02
 #define RUMPCN_HASNTBUF 0x04
 int			rump_namei(uint32_t, uint32_t, const char *,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump.c,v 1.105 2009/04/30 16:59:32 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.106 2009/05/02 15:20:08 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.105 2009/04/30 16:59:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.106 2009/05/02 15:20:08 pooka Exp $");
 #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/evcnt.h>
 #include <sys/event.h>
 #include <sys/filedesc.h>
 #include <sys/iostat.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 @@ -472,33 +472,40 @@ rump_nextlid(void)
 	 * Take next one, don't return 0
 	 * XXX: most likely we'll have collisions in case this
 	 * wraps around.
 	 */
 	if (++proc0.p_nlwpid == 0)
 		++proc0.p_nlwpid;
 	retid = proc0.p_nlwpid;
 	mutex_exit(proc0.p_lock);
 	return retid;
+}
 int
-rump_module_load(struct modinfo **mi)
+rump_module_init(struct modinfo *mi, prop_dictionary_t props)
+{
-	if (!module_compatible((*mi)->mi_version, __NetBSD_Version__))
+	if (!module_compatible(mi->mi_version, __NetBSD_Version__))
 		return EPROGMISMATCH;
-	return (*mi)->mi_modcmd(MODULE_CMD_INIT, NULL);
+	return mi->mi_modcmd(MODULE_CMD_INIT, props);
+}
 int
 rump_module_fini(struct modinfo *mi)
+{
 	return mi->mi_modcmd(MODULE_CMD_FINI, NULL);
+}
 int _syspuffs_stub(int, int *);
 int
 _syspuffs_stub(int fd, int *newfd)
+{
 	return ENODEV;
+}
 __weak_alias(rump_syspuffs_glueinit,_syspuffs_stub);
 static int
 rump_sysproxy_local(int num, void *arg, uint8_t *data, size_t dlen,