Module Name: src Committed By: pooka Date: Wed Oct 14 18:16:41 UTC 2009
Modified Files: src/sys/rump/include/rump: rumpkern_if_pub.h rumpnet_if_pub.h rumpvfs_if_pub.h src/sys/rump/librump/rumpkern: rumpkern_if_priv.h rumpkern_if_wrappers.c src/sys/rump/librump/rumpnet: rumpnet_if_priv.h rumpnet_if_wrappers.c src/sys/rump/librump/rumpvfs: rumpvfs_if_priv.h rumpvfs_if_wrappers.c Log Message: regen: put all public interfaces created by ifspec into a rump_pub namespace To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump/rumpkern_if_pub.h \ src/sys/rump/include/rump/rumpnet_if_pub.h \ src/sys/rump/include/rump/rumpvfs_if_pub.h cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h \ src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpnet/rumpnet_if_priv.h \ src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h \ src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c 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/include/rump/rumpkern_if_pub.h diff -u src/sys/rump/include/rump/rumpkern_if_pub.h:1.1 src/sys/rump/include/rump/rumpkern_if_pub.h:1.2 --- src/sys/rump/include/rump/rumpkern_if_pub.h:1.1 Wed Oct 14 17:28:13 2009 +++ src/sys/rump/include/rump/rumpkern_if_pub.h Wed Oct 14 18:16:41 2009 @@ -1,27 +1,27 @@ -/* $NetBSD: rumpkern_if_pub.h,v 1.1 2009/10/14 17:28:13 pooka Exp $ */ +/* $NetBSD: rumpkern_if_pub.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpkern.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ -void rump_reboot(int); -int rump_getversion(void); -int rump_module_init(struct modinfo *, prop_dictionary_t); -int rump_module_fini(struct modinfo *); -struct uio * rump_uio_setup(void *, size_t, off_t, enum rump_uiorw); -size_t rump_uio_getresid(struct uio *); -off_t rump_uio_getoff(struct uio *); -size_t rump_uio_free(struct uio *); -kauth_cred_t rump_cred_create(uid_t, gid_t, size_t, gid_t *); -kauth_cred_t rump_cred_suserget(void); -void rump_cred_put(kauth_cred_t); -struct lwp * rump_newproc_switch(void); -struct lwp * rump_setup_curlwp(pid_t, lwpid_t, int); -struct lwp * rump_get_curlwp(void); -void rump_set_curlwp(struct lwp *); -void rump_clear_curlwp(void); -int rump_sysproxy_set(rump_sysproxy_t, void *); -int rump_sysproxy_socket_setup_client(int); -int rump_sysproxy_socket_setup_server(int); +void rump_pub_reboot(int); +int rump_pub_getversion(void); +int rump_pub_module_init(struct modinfo *, prop_dictionary_t); +int rump_pub_module_fini(struct modinfo *); +struct uio * rump_pub_uio_setup(void *, size_t, off_t, enum rump_uiorw); +size_t rump_pub_uio_getresid(struct uio *); +off_t rump_pub_uio_getoff(struct uio *); +size_t rump_pub_uio_free(struct uio *); +kauth_cred_t rump_pub_cred_create(uid_t, gid_t, size_t, gid_t *); +kauth_cred_t rump_pub_cred_suserget(void); +void rump_pub_cred_put(kauth_cred_t); +struct lwp * rump_pub_newproc_switch(void); +struct lwp * rump_pub_setup_curlwp(pid_t, lwpid_t, int); +struct lwp * rump_pub_get_curlwp(void); +void rump_pub_set_curlwp(struct lwp *); +void rump_pub_clear_curlwp(void); +int rump_pub_sysproxy_set(rump_sysproxy_t, void *); +int rump_pub_sysproxy_socket_setup_client(int); +int rump_pub_sysproxy_socket_setup_server(int); Index: src/sys/rump/include/rump/rumpnet_if_pub.h diff -u src/sys/rump/include/rump/rumpnet_if_pub.h:1.1 src/sys/rump/include/rump/rumpnet_if_pub.h:1.2 --- src/sys/rump/include/rump/rumpnet_if_pub.h:1.1 Wed Oct 14 17:28:13 2009 +++ src/sys/rump/include/rump/rumpnet_if_pub.h Wed Oct 14 18:16:41 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpnet_if_pub.h,v 1.1 2009/10/14 17:28:13 pooka Exp $ */ +/* $NetBSD: rumpnet_if_pub.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpnet.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ -int rump_virtif_create(int); +int rump_pub_virtif_create(int); Index: src/sys/rump/include/rump/rumpvfs_if_pub.h diff -u src/sys/rump/include/rump/rumpvfs_if_pub.h:1.1 src/sys/rump/include/rump/rumpvfs_if_pub.h:1.2 --- src/sys/rump/include/rump/rumpvfs_if_pub.h:1.1 Wed Oct 14 17:28:13 2009 +++ src/sys/rump/include/rump/rumpvfs_if_pub.h Wed Oct 14 18:16:41 2009 @@ -1,42 +1,42 @@ -/* $NetBSD: rumpvfs_if_pub.h,v 1.1 2009/10/14 17:28:13 pooka Exp $ */ +/* $NetBSD: rumpvfs_if_pub.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpvfs.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ -void rump_getvninfo(struct vnode *, enum vtype *, off_t *, dev_t *); -struct vfsops * rump_vfslist_iterate(struct vfsops *); -struct vfsops * rump_vfs_getopsbyname(const char *); -struct vattr * rump_vattr_init(void); -void rump_vattr_settype(struct vattr *, enum vtype); -void rump_vattr_setmode(struct vattr *, mode_t); -void rump_vattr_setrdev(struct vattr *, dev_t); -void rump_vattr_free(struct vattr *); -void rump_vp_incref(struct vnode *); -int rump_vp_getref(struct vnode *); -void rump_vp_rele(struct vnode *); -void rump_vp_interlock(struct vnode *); -int rump_etfs_register(const char *, const char *, enum rump_etfs_type); -int rump_etfs_register_withsize(const char *, const char *, enum rump_etfs_type, uint64_t, uint64_t); -int rump_etfs_remove(const char *); -void rump_freecn(struct componentname *, int); -int rump_checksavecn(struct componentname *); -int rump_namei(uint32_t, uint32_t, const char *, struct vnode **, struct vnode **, struct componentname **); -struct componentname * rump_makecn(u_long, u_long, const char *, size_t, kauth_cred_t, struct lwp *); -int rump_vfs_unmount(struct mount *, int); -int rump_vfs_root(struct mount *, struct vnode **, int); -int rump_vfs_statvfs(struct mount *, struct statvfs *); -int rump_vfs_sync(struct mount *, int, kauth_cred_t); -int rump_vfs_fhtovp(struct mount *, struct fid *, struct vnode **); -int rump_vfs_vptofh(struct vnode *, struct fid *, size_t *); -void rump_vfs_syncwait(struct mount *); -int rump_vfs_getmp(const char *, struct mount **); -void rump_rcvp_set(struct vnode *, struct vnode *); -struct vnode * rump_cdir_get(void); -int rump_syspuffs_glueinit(int, int *); -int rump_sys___stat30(const char *, struct stat *); -int rump_sys___lstat30(const char *, struct stat *); -void rump_vattr50_to_vattr(const struct vattr *, struct vattr *); -void rump_vattr_to_vattr50(const struct vattr *, struct vattr *); +void rump_pub_getvninfo(struct vnode *, enum vtype *, off_t *, dev_t *); +struct vfsops * rump_pub_vfslist_iterate(struct vfsops *); +struct vfsops * rump_pub_vfs_getopsbyname(const char *); +struct vattr * rump_pub_vattr_init(void); +void rump_pub_vattr_settype(struct vattr *, enum vtype); +void rump_pub_vattr_setmode(struct vattr *, mode_t); +void rump_pub_vattr_setrdev(struct vattr *, dev_t); +void rump_pub_vattr_free(struct vattr *); +void rump_pub_vp_incref(struct vnode *); +int rump_pub_vp_getref(struct vnode *); +void rump_pub_vp_rele(struct vnode *); +void rump_pub_vp_interlock(struct vnode *); +int rump_pub_etfs_register(const char *, const char *, enum rump_etfs_type); +int rump_pub_etfs_register_withsize(const char *, const char *, enum rump_etfs_type, uint64_t, uint64_t); +int rump_pub_etfs_remove(const char *); +void rump_pub_freecn(struct componentname *, int); +int rump_pub_checksavecn(struct componentname *); +int rump_pub_namei(uint32_t, uint32_t, const char *, struct vnode **, struct vnode **, struct componentname **); +struct componentname * rump_pub_makecn(u_long, u_long, const char *, size_t, kauth_cred_t, struct lwp *); +int rump_pub_vfs_unmount(struct mount *, int); +int rump_pub_vfs_root(struct mount *, struct vnode **, int); +int rump_pub_vfs_statvfs(struct mount *, struct statvfs *); +int rump_pub_vfs_sync(struct mount *, int, kauth_cred_t); +int rump_pub_vfs_fhtovp(struct mount *, struct fid *, struct vnode **); +int rump_pub_vfs_vptofh(struct vnode *, struct fid *, size_t *); +void rump_pub_vfs_syncwait(struct mount *); +int rump_pub_vfs_getmp(const char *, struct mount **); +void rump_pub_rcvp_set(struct vnode *, struct vnode *); +struct vnode * rump_pub_cdir_get(void); +int rump_pub_syspuffs_glueinit(int, int *); +int rump_pub_sys___stat30(const char *, struct stat *); +int rump_pub_sys___lstat30(const char *, struct stat *); +void rump_pub_vattr50_to_vattr(const struct vattr *, struct vattr *); +void rump_pub_vattr_to_vattr50(const struct vattr *, struct vattr *); Index: src/sys/rump/librump/rumpkern/rumpkern_if_priv.h diff -u src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.1 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.2 --- src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.1 Wed Oct 14 17:28:14 2009 +++ src/sys/rump/librump/rumpkern/rumpkern_if_priv.h Wed Oct 14 18:16:41 2009 @@ -1,27 +1,27 @@ -/* $NetBSD: rumpkern_if_priv.h,v 1.1 2009/10/14 17:28:14 pooka Exp $ */ +/* $NetBSD: rumpkern_if_priv.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpkern.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ -void rumppriv_reboot(int); -int rumppriv_getversion(void); -int rumppriv_module_init(struct modinfo *, prop_dictionary_t); -int rumppriv_module_fini(struct modinfo *); -struct uio * rumppriv_uio_setup(void *, size_t, off_t, enum rump_uiorw); -size_t rumppriv_uio_getresid(struct uio *); -off_t rumppriv_uio_getoff(struct uio *); -size_t rumppriv_uio_free(struct uio *); -kauth_cred_t rumppriv_cred_create(uid_t, gid_t, size_t, gid_t *); -kauth_cred_t rumppriv_cred_suserget(void); -void rumppriv_cred_put(kauth_cred_t); -struct lwp * rumppriv_newproc_switch(void); -struct lwp * rumppriv_setup_curlwp(pid_t, lwpid_t, int); -struct lwp * rumppriv_get_curlwp(void); -void rumppriv_set_curlwp(struct lwp *); -void rumppriv_clear_curlwp(void); -int rumppriv_sysproxy_set(rump_sysproxy_t, void *); -int rumppriv_sysproxy_socket_setup_client(int); -int rumppriv_sysproxy_socket_setup_server(int); +void rump_reboot(int); +int rump_getversion(void); +int rump_module_init(struct modinfo *, prop_dictionary_t); +int rump_module_fini(struct modinfo *); +struct uio * rump_uio_setup(void *, size_t, off_t, enum rump_uiorw); +size_t rump_uio_getresid(struct uio *); +off_t rump_uio_getoff(struct uio *); +size_t rump_uio_free(struct uio *); +kauth_cred_t rump_cred_create(uid_t, gid_t, size_t, gid_t *); +kauth_cred_t rump_cred_suserget(void); +void rump_cred_put(kauth_cred_t); +struct lwp * rump_newproc_switch(void); +struct lwp * rump_setup_curlwp(pid_t, lwpid_t, int); +struct lwp * rump_get_curlwp(void); +void rump_set_curlwp(struct lwp *); +void rump_clear_curlwp(void); +int rump_sysproxy_set(rump_sysproxy_t, void *); +int rump_sysproxy_socket_setup_client(int); +int rump_sysproxy_socket_setup_server(int); Index: src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c diff -u src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.1 src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.2 --- src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.1 Wed Oct 14 17:28:14 2009 +++ src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c Wed Oct 14 18:16:41 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpkern_if_wrappers.c,v 1.1 2009/10/14 17:28:14 pooka Exp $ */ +/* $NetBSD: rumpkern_if_wrappers.c,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpkern.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ #include <sys/cdefs.h> @@ -23,179 +23,179 @@ } void -rump_reboot(int arg1) +rump_pub_reboot(int arg1) { - rumppriv_reboot(arg1); + rump_reboot(arg1); } int -rump_getversion(void) +rump_pub_getversion(void) { int rv; - rv = rumppriv_getversion(); + rv = rump_getversion(); return rv; } int -rump_module_init(struct modinfo *arg1, prop_dictionary_t arg2) +rump_pub_module_init(struct modinfo *arg1, prop_dictionary_t arg2) { int rv; - rv = rumppriv_module_init(arg1, arg2); + rv = rump_module_init(arg1, arg2); return rv; } int -rump_module_fini(struct modinfo *arg1) +rump_pub_module_fini(struct modinfo *arg1) { int rv; - rv = rumppriv_module_fini(arg1); + rv = rump_module_fini(arg1); return rv; } struct uio * -rump_uio_setup(void *arg1, size_t arg2, off_t arg3, enum rump_uiorw arg4) +rump_pub_uio_setup(void *arg1, size_t arg2, off_t arg3, enum rump_uiorw arg4) { struct uio * rv; - rv = rumppriv_uio_setup(arg1, arg2, arg3, arg4); + rv = rump_uio_setup(arg1, arg2, arg3, arg4); return rv; } size_t -rump_uio_getresid(struct uio *arg1) +rump_pub_uio_getresid(struct uio *arg1) { size_t rv; - rv = rumppriv_uio_getresid(arg1); + rv = rump_uio_getresid(arg1); return rv; } off_t -rump_uio_getoff(struct uio *arg1) +rump_pub_uio_getoff(struct uio *arg1) { off_t rv; - rv = rumppriv_uio_getoff(arg1); + rv = rump_uio_getoff(arg1); return rv; } size_t -rump_uio_free(struct uio *arg1) +rump_pub_uio_free(struct uio *arg1) { size_t rv; - rv = rumppriv_uio_free(arg1); + rv = rump_uio_free(arg1); return rv; } kauth_cred_t -rump_cred_create(uid_t arg1, gid_t arg2, size_t arg3, gid_t *arg4) +rump_pub_cred_create(uid_t arg1, gid_t arg2, size_t arg3, gid_t *arg4) { kauth_cred_t rv; - rv = rumppriv_cred_create(arg1, arg2, arg3, arg4); + rv = rump_cred_create(arg1, arg2, arg3, arg4); return rv; } kauth_cred_t -rump_cred_suserget(void) +rump_pub_cred_suserget(void) { kauth_cred_t rv; - rv = rumppriv_cred_suserget(); + rv = rump_cred_suserget(); return rv; } void -rump_cred_put(kauth_cred_t arg1) +rump_pub_cred_put(kauth_cred_t arg1) { - rumppriv_cred_put(arg1); + rump_cred_put(arg1); } struct lwp * -rump_newproc_switch(void) +rump_pub_newproc_switch(void) { struct lwp * rv; - rv = rumppriv_newproc_switch(); + rv = rump_newproc_switch(); return rv; } struct lwp * -rump_setup_curlwp(pid_t arg1, lwpid_t arg2, int arg3) +rump_pub_setup_curlwp(pid_t arg1, lwpid_t arg2, int arg3) { struct lwp * rv; - rv = rumppriv_setup_curlwp(arg1, arg2, arg3); + rv = rump_setup_curlwp(arg1, arg2, arg3); return rv; } struct lwp * -rump_get_curlwp(void) +rump_pub_get_curlwp(void) { struct lwp * rv; - rv = rumppriv_get_curlwp(); + rv = rump_get_curlwp(); return rv; } void -rump_set_curlwp(struct lwp *arg1) +rump_pub_set_curlwp(struct lwp *arg1) { - rumppriv_set_curlwp(arg1); + rump_set_curlwp(arg1); } void -rump_clear_curlwp(void) +rump_pub_clear_curlwp(void) { - rumppriv_clear_curlwp(); + rump_clear_curlwp(); } int -rump_sysproxy_set(rump_sysproxy_t arg1, void *arg2) +rump_pub_sysproxy_set(rump_sysproxy_t arg1, void *arg2) { int rv; - rv = rumppriv_sysproxy_set(arg1, arg2); + rv = rump_sysproxy_set(arg1, arg2); return rv; } int -rump_sysproxy_socket_setup_client(int arg1) +rump_pub_sysproxy_socket_setup_client(int arg1) { int rv; - rv = rumppriv_sysproxy_socket_setup_client(arg1); + rv = rump_sysproxy_socket_setup_client(arg1); return rv; } int -rump_sysproxy_socket_setup_server(int arg1) +rump_pub_sysproxy_socket_setup_server(int arg1) { int rv; - rv = rumppriv_sysproxy_socket_setup_server(arg1); + rv = rump_sysproxy_socket_setup_server(arg1); return rv; } Index: src/sys/rump/librump/rumpnet/rumpnet_if_priv.h diff -u src/sys/rump/librump/rumpnet/rumpnet_if_priv.h:1.1 src/sys/rump/librump/rumpnet/rumpnet_if_priv.h:1.2 --- src/sys/rump/librump/rumpnet/rumpnet_if_priv.h:1.1 Wed Oct 14 17:28:14 2009 +++ src/sys/rump/librump/rumpnet/rumpnet_if_priv.h Wed Oct 14 18:16:41 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpnet_if_priv.h,v 1.1 2009/10/14 17:28:14 pooka Exp $ */ +/* $NetBSD: rumpnet_if_priv.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpnet.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ -int rumppriv_virtif_create(int); +int rump_virtif_create(int); Index: src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c diff -u src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c:1.1 src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c:1.2 --- src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c:1.1 Wed Oct 14 17:28:14 2009 +++ src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c Wed Oct 14 18:16:41 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpnet_if_wrappers.c,v 1.1 2009/10/14 17:28:14 pooka Exp $ */ +/* $NetBSD: rumpnet_if_wrappers.c,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpnet.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ #include <sys/cdefs.h> @@ -23,12 +23,12 @@ } int -rump_virtif_create(int arg1) +rump_pub_virtif_create(int arg1) { int rv; - rv = rumppriv_virtif_create(arg1); + rv = rump_virtif_create(arg1); return rv; } -__weak_alias(rumppriv_virtif_create,rump_net_unavailable); +__weak_alias(rump_virtif_create,rump_net_unavailable); Index: src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h diff -u src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h:1.1 src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h:1.2 --- src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h:1.1 Wed Oct 14 17:28:14 2009 +++ src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h Wed Oct 14 18:16:41 2009 @@ -1,42 +1,42 @@ -/* $NetBSD: rumpvfs_if_priv.h,v 1.1 2009/10/14 17:28:14 pooka Exp $ */ +/* $NetBSD: rumpvfs_if_priv.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpvfs.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ -void rumppriv_getvninfo(struct vnode *, enum vtype *, off_t *, dev_t *); -struct vfsops * rumppriv_vfslist_iterate(struct vfsops *); -struct vfsops * rumppriv_vfs_getopsbyname(const char *); -struct vattr * rumppriv_vattr_init(void); -void rumppriv_vattr_settype(struct vattr *, enum vtype); -void rumppriv_vattr_setmode(struct vattr *, mode_t); -void rumppriv_vattr_setrdev(struct vattr *, dev_t); -void rumppriv_vattr_free(struct vattr *); -void rumppriv_vp_incref(struct vnode *); -int rumppriv_vp_getref(struct vnode *); -void rumppriv_vp_rele(struct vnode *); -void rumppriv_vp_interlock(struct vnode *); -int rumppriv_etfs_register(const char *, const char *, enum rump_etfs_type); -int rumppriv_etfs_register_withsize(const char *, const char *, enum rump_etfs_type, uint64_t, uint64_t); -int rumppriv_etfs_remove(const char *); -void rumppriv_freecn(struct componentname *, int); -int rumppriv_checksavecn(struct componentname *); -int rumppriv_namei(uint32_t, uint32_t, const char *, struct vnode **, struct vnode **, struct componentname **); -struct componentname * rumppriv_makecn(u_long, u_long, const char *, size_t, kauth_cred_t, struct lwp *); -int rumppriv_vfs_unmount(struct mount *, int); -int rumppriv_vfs_root(struct mount *, struct vnode **, int); -int rumppriv_vfs_statvfs(struct mount *, struct statvfs *); -int rumppriv_vfs_sync(struct mount *, int, kauth_cred_t); -int rumppriv_vfs_fhtovp(struct mount *, struct fid *, struct vnode **); -int rumppriv_vfs_vptofh(struct vnode *, struct fid *, size_t *); -void rumppriv_vfs_syncwait(struct mount *); -int rumppriv_vfs_getmp(const char *, struct mount **); -void rumppriv_rcvp_set(struct vnode *, struct vnode *); -struct vnode * rumppriv_cdir_get(void); -int rumppriv_syspuffs_glueinit(int, int *); -int rumppriv_sys___stat30(const char *, struct stat *); -int rumppriv_sys___lstat30(const char *, struct stat *); -void rumppriv_vattr50_to_vattr(const struct vattr *, struct vattr *); -void rumppriv_vattr_to_vattr50(const struct vattr *, struct vattr *); +void rump_getvninfo(struct vnode *, enum vtype *, off_t *, dev_t *); +struct vfsops * rump_vfslist_iterate(struct vfsops *); +struct vfsops * rump_vfs_getopsbyname(const char *); +struct vattr * rump_vattr_init(void); +void rump_vattr_settype(struct vattr *, enum vtype); +void rump_vattr_setmode(struct vattr *, mode_t); +void rump_vattr_setrdev(struct vattr *, dev_t); +void rump_vattr_free(struct vattr *); +void rump_vp_incref(struct vnode *); +int rump_vp_getref(struct vnode *); +void rump_vp_rele(struct vnode *); +void rump_vp_interlock(struct vnode *); +int rump_etfs_register(const char *, const char *, enum rump_etfs_type); +int rump_etfs_register_withsize(const char *, const char *, enum rump_etfs_type, uint64_t, uint64_t); +int rump_etfs_remove(const char *); +void rump_freecn(struct componentname *, int); +int rump_checksavecn(struct componentname *); +int rump_namei(uint32_t, uint32_t, const char *, struct vnode **, struct vnode **, struct componentname **); +struct componentname * rump_makecn(u_long, u_long, const char *, size_t, kauth_cred_t, struct lwp *); +int rump_vfs_unmount(struct mount *, int); +int rump_vfs_root(struct mount *, struct vnode **, int); +int rump_vfs_statvfs(struct mount *, struct statvfs *); +int rump_vfs_sync(struct mount *, int, kauth_cred_t); +int rump_vfs_fhtovp(struct mount *, struct fid *, struct vnode **); +int rump_vfs_vptofh(struct vnode *, struct fid *, size_t *); +void rump_vfs_syncwait(struct mount *); +int rump_vfs_getmp(const char *, struct mount **); +void rump_rcvp_set(struct vnode *, struct vnode *); +struct vnode * rump_cdir_get(void); +int rump_syspuffs_glueinit(int, int *); +int rump_sys___stat30(const char *, struct stat *); +int rump_sys___lstat30(const char *, struct stat *); +void rump_vattr50_to_vattr(const struct vattr *, struct vattr *); +void rump_vattr_to_vattr50(const struct vattr *, struct vattr *); Index: src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c diff -u src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c:1.1 src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c:1.2 --- src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c:1.1 Wed Oct 14 17:28:14 2009 +++ src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c Wed Oct 14 18:16:41 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpvfs_if_wrappers.c,v 1.1 2009/10/14 17:28:14 pooka Exp $ */ +/* $NetBSD: rumpvfs_if_wrappers.c,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpvfs.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ #include <sys/cdefs.h> @@ -23,303 +23,303 @@ } void -rump_getvninfo(struct vnode *arg1, enum vtype *arg2, off_t *arg3, dev_t *arg4) +rump_pub_getvninfo(struct vnode *arg1, enum vtype *arg2, off_t *arg3, dev_t *arg4) { - rumppriv_getvninfo(arg1, arg2, arg3, arg4); + rump_getvninfo(arg1, arg2, arg3, arg4); } struct vfsops * -rump_vfslist_iterate(struct vfsops *arg1) +rump_pub_vfslist_iterate(struct vfsops *arg1) { struct vfsops * rv; - rv = rumppriv_vfslist_iterate(arg1); + rv = rump_vfslist_iterate(arg1); return rv; } struct vfsops * -rump_vfs_getopsbyname(const char *arg1) +rump_pub_vfs_getopsbyname(const char *arg1) { struct vfsops * rv; - rv = rumppriv_vfs_getopsbyname(arg1); + rv = rump_vfs_getopsbyname(arg1); return rv; } struct vattr * -rump_vattr_init(void) +rump_pub_vattr_init(void) { struct vattr * rv; - rv = rumppriv_vattr_init(); + rv = rump_vattr_init(); return rv; } void -rump_vattr_settype(struct vattr *arg1, enum vtype arg2) +rump_pub_vattr_settype(struct vattr *arg1, enum vtype arg2) { - rumppriv_vattr_settype(arg1, arg2); + rump_vattr_settype(arg1, arg2); } void -rump_vattr_setmode(struct vattr *arg1, mode_t arg2) +rump_pub_vattr_setmode(struct vattr *arg1, mode_t arg2) { - rumppriv_vattr_setmode(arg1, arg2); + rump_vattr_setmode(arg1, arg2); } void -rump_vattr_setrdev(struct vattr *arg1, dev_t arg2) +rump_pub_vattr_setrdev(struct vattr *arg1, dev_t arg2) { - rumppriv_vattr_setrdev(arg1, arg2); + rump_vattr_setrdev(arg1, arg2); } void -rump_vattr_free(struct vattr *arg1) +rump_pub_vattr_free(struct vattr *arg1) { - rumppriv_vattr_free(arg1); + rump_vattr_free(arg1); } void -rump_vp_incref(struct vnode *arg1) +rump_pub_vp_incref(struct vnode *arg1) { - rumppriv_vp_incref(arg1); + rump_vp_incref(arg1); } int -rump_vp_getref(struct vnode *arg1) +rump_pub_vp_getref(struct vnode *arg1) { int rv; - rv = rumppriv_vp_getref(arg1); + rv = rump_vp_getref(arg1); return rv; } void -rump_vp_rele(struct vnode *arg1) +rump_pub_vp_rele(struct vnode *arg1) { - rumppriv_vp_rele(arg1); + rump_vp_rele(arg1); } void -rump_vp_interlock(struct vnode *arg1) +rump_pub_vp_interlock(struct vnode *arg1) { - rumppriv_vp_interlock(arg1); + rump_vp_interlock(arg1); } int -rump_etfs_register(const char *arg1, const char *arg2, enum rump_etfs_type arg3) +rump_pub_etfs_register(const char *arg1, const char *arg2, enum rump_etfs_type arg3) { int rv; - rv = rumppriv_etfs_register(arg1, arg2, arg3); + rv = rump_etfs_register(arg1, arg2, arg3); return rv; } int -rump_etfs_register_withsize(const char *arg1, const char *arg2, enum rump_etfs_type arg3, uint64_t arg4, uint64_t arg5) +rump_pub_etfs_register_withsize(const char *arg1, const char *arg2, enum rump_etfs_type arg3, uint64_t arg4, uint64_t arg5) { int rv; - rv = rumppriv_etfs_register_withsize(arg1, arg2, arg3, arg4, arg5); + rv = rump_etfs_register_withsize(arg1, arg2, arg3, arg4, arg5); return rv; } int -rump_etfs_remove(const char *arg1) +rump_pub_etfs_remove(const char *arg1) { int rv; - rv = rumppriv_etfs_remove(arg1); + rv = rump_etfs_remove(arg1); return rv; } void -rump_freecn(struct componentname *arg1, int arg2) +rump_pub_freecn(struct componentname *arg1, int arg2) { - rumppriv_freecn(arg1, arg2); + rump_freecn(arg1, arg2); } int -rump_checksavecn(struct componentname *arg1) +rump_pub_checksavecn(struct componentname *arg1) { int rv; - rv = rumppriv_checksavecn(arg1); + rv = rump_checksavecn(arg1); return rv; } int -rump_namei(uint32_t arg1, uint32_t arg2, const char *arg3, struct vnode **arg4, struct vnode **arg5, struct componentname **arg6) +rump_pub_namei(uint32_t arg1, uint32_t arg2, const char *arg3, struct vnode **arg4, struct vnode **arg5, struct componentname **arg6) { int rv; - rv = rumppriv_namei(arg1, arg2, arg3, arg4, arg5, arg6); + rv = rump_namei(arg1, arg2, arg3, arg4, arg5, arg6); return rv; } struct componentname * -rump_makecn(u_long arg1, u_long arg2, const char *arg3, size_t arg4, kauth_cred_t arg5, struct lwp *arg6) +rump_pub_makecn(u_long arg1, u_long arg2, const char *arg3, size_t arg4, kauth_cred_t arg5, struct lwp *arg6) { struct componentname * rv; - rv = rumppriv_makecn(arg1, arg2, arg3, arg4, arg5, arg6); + rv = rump_makecn(arg1, arg2, arg3, arg4, arg5, arg6); return rv; } int -rump_vfs_unmount(struct mount *arg1, int arg2) +rump_pub_vfs_unmount(struct mount *arg1, int arg2) { int rv; - rv = rumppriv_vfs_unmount(arg1, arg2); + rv = rump_vfs_unmount(arg1, arg2); return rv; } int -rump_vfs_root(struct mount *arg1, struct vnode **arg2, int arg3) +rump_pub_vfs_root(struct mount *arg1, struct vnode **arg2, int arg3) { int rv; - rv = rumppriv_vfs_root(arg1, arg2, arg3); + rv = rump_vfs_root(arg1, arg2, arg3); return rv; } int -rump_vfs_statvfs(struct mount *arg1, struct statvfs *arg2) +rump_pub_vfs_statvfs(struct mount *arg1, struct statvfs *arg2) { int rv; - rv = rumppriv_vfs_statvfs(arg1, arg2); + rv = rump_vfs_statvfs(arg1, arg2); return rv; } int -rump_vfs_sync(struct mount *arg1, int arg2, kauth_cred_t arg3) +rump_pub_vfs_sync(struct mount *arg1, int arg2, kauth_cred_t arg3) { int rv; - rv = rumppriv_vfs_sync(arg1, arg2, arg3); + rv = rump_vfs_sync(arg1, arg2, arg3); return rv; } int -rump_vfs_fhtovp(struct mount *arg1, struct fid *arg2, struct vnode **arg3) +rump_pub_vfs_fhtovp(struct mount *arg1, struct fid *arg2, struct vnode **arg3) { int rv; - rv = rumppriv_vfs_fhtovp(arg1, arg2, arg3); + rv = rump_vfs_fhtovp(arg1, arg2, arg3); return rv; } int -rump_vfs_vptofh(struct vnode *arg1, struct fid *arg2, size_t *arg3) +rump_pub_vfs_vptofh(struct vnode *arg1, struct fid *arg2, size_t *arg3) { int rv; - rv = rumppriv_vfs_vptofh(arg1, arg2, arg3); + rv = rump_vfs_vptofh(arg1, arg2, arg3); return rv; } void -rump_vfs_syncwait(struct mount *arg1) +rump_pub_vfs_syncwait(struct mount *arg1) { - rumppriv_vfs_syncwait(arg1); + rump_vfs_syncwait(arg1); } int -rump_vfs_getmp(const char *arg1, struct mount **arg2) +rump_pub_vfs_getmp(const char *arg1, struct mount **arg2) { int rv; - rv = rumppriv_vfs_getmp(arg1, arg2); + rv = rump_vfs_getmp(arg1, arg2); return rv; } void -rump_rcvp_set(struct vnode *arg1, struct vnode *arg2) +rump_pub_rcvp_set(struct vnode *arg1, struct vnode *arg2) { - rumppriv_rcvp_set(arg1, arg2); + rump_rcvp_set(arg1, arg2); } struct vnode * -rump_cdir_get(void) +rump_pub_cdir_get(void) { struct vnode * rv; - rv = rumppriv_cdir_get(); + rv = rump_cdir_get(); return rv; } int -rump_syspuffs_glueinit(int arg1, int *arg2) +rump_pub_syspuffs_glueinit(int arg1, int *arg2) { int rv; - rv = rumppriv_syspuffs_glueinit(arg1, arg2); + rv = rump_syspuffs_glueinit(arg1, arg2); return rv; } -__weak_alias(rumppriv_syspuffs_glueinit,rump_vfs_unavailable); +__weak_alias(rump_syspuffs_glueinit,rump_vfs_unavailable); int -rump_sys___stat30(const char *arg1, struct stat *arg2) +rump_pub_sys___stat30(const char *arg1, struct stat *arg2) { int rv; - rv = rumppriv_sys___stat30(arg1, arg2); + rv = rump_sys___stat30(arg1, arg2); return rv; } int -rump_sys___lstat30(const char *arg1, struct stat *arg2) +rump_pub_sys___lstat30(const char *arg1, struct stat *arg2) { int rv; - rv = rumppriv_sys___lstat30(arg1, arg2); + rv = rump_sys___lstat30(arg1, arg2); return rv; } void -rump_vattr50_to_vattr(const struct vattr *arg1, struct vattr *arg2) +rump_pub_vattr50_to_vattr(const struct vattr *arg1, struct vattr *arg2) { - rumppriv_vattr50_to_vattr(arg1, arg2); + rump_vattr50_to_vattr(arg1, arg2); } void -rump_vattr_to_vattr50(const struct vattr *arg1, struct vattr *arg2) +rump_pub_vattr_to_vattr50(const struct vattr *arg1, struct vattr *arg2) { - rumppriv_vattr_to_vattr50(arg1, arg2); + rump_vattr_to_vattr50(arg1, arg2); }