Re: CVS commit: src/sys/rump/include/rump
On 16.06.2020 14:23, Kamil Rytarowski wrote: > On 16.06.2020 12:25, J. Hannken-Illjes wrote: >>> On 15. Jun 2020, at 01:38, Kamil Rytarowski wrote: >>> >>> Module Name:src >>> Committed By: kamil >>> Date: Sun Jun 14 23:38:25 UTC 2020 >>> >>> Modified Files: >>> src/sys/rump/include/rump: rump.h >>> >>> Log Message: >>> Remove old compat include of rump_syscallshotgun.h >>> >>> It was separated in 2016 and is no longer needed. >>> >>> >>> To generate a diff of this commit: >>> cvs rdiff -u -r1.71 -r1.72 src/sys/rump/include/rump/rump.h >>> >>> Please note that diffs are not public domain; they are subject to the >>> copyright notices on the relevant files. >> >> This broke most or all NFS tests on ATF (see attached list). >> >> Please revert or investigate. >> >> -- >> J. Hannken-Illjes - hann...@eis.cs.tu-bs.de - TU Braunschweig (Germany) >> > > I'm looking into it. > Should be fixed. signature.asc Description: OpenPGP digital signature
Re: CVS commit: src/sys/rump/include/rump
On 16.06.2020 12:25, J. Hannken-Illjes wrote: >> On 15. Jun 2020, at 01:38, Kamil Rytarowski wrote: >> >> Module Name: src >> Committed By:kamil >> Date:Sun Jun 14 23:38:25 UTC 2020 >> >> Modified Files: >> src/sys/rump/include/rump: rump.h >> >> Log Message: >> Remove old compat include of rump_syscallshotgun.h >> >> It was separated in 2016 and is no longer needed. >> >> >> To generate a diff of this commit: >> cvs rdiff -u -r1.71 -r1.72 src/sys/rump/include/rump/rump.h >> >> Please note that diffs are not public domain; they are subject to the >> copyright notices on the relevant files. > > This broke most or all NFS tests on ATF (see attached list). > > Please revert or investigate. > > -- > J. Hannken-Illjes - hann...@eis.cs.tu-bs.de - TU Braunschweig (Germany) > I'm looking into it. signature.asc Description: OpenPGP digital signature
Re: CVS commit: src/sys/rump/include/rump
> On 15. Jun 2020, at 01:38, Kamil Rytarowski wrote: > > Module Name: src > Committed By: kamil > Date: Sun Jun 14 23:38:25 UTC 2020 > > Modified Files: > src/sys/rump/include/rump: rump.h > > Log Message: > Remove old compat include of rump_syscallshotgun.h > > It was separated in 2016 and is no longer needed. > > > To generate a diff of this commit: > cvs rdiff -u -r1.71 -r1.72 src/sys/rump/include/rump/rump.h > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. This broke most or all NFS tests on ATF (see attached list). Please revert or investigate. -- J. Hannken-Illjes - hann...@eis.cs.tu-bs.de - TU Braunschweig (Germany) fs/nfs/t_mountd::mountdhup fs/vfs/t_full::nfs_fillfs fs/vfs/t_io::nfs_extendfile fs/vfs/t_io::nfs_extendfile_append fs/vfs/t_io::nfs_holywrite fs/vfs/t_io::nfs_overwrite512 fs/vfs/t_io::nfs_overwrite64k fs/vfs/t_io::nfs_overwrite_trunc fs/vfs/t_io::nfs_read_after_unlink fs/vfs/t_io::nfs_read_fault fs/vfs/t_io::nfs_shrinkfile fs/vfs/t_io::nfs_wrrd_after_unlink fs/vfs/t_mtime_otrunc::nfs_otrunc_mtime_update fs/vfs/t_mtime_write::nfs_mtime_update_on_write fs/vfs/t_renamerace::nfs_renamerace fs/vfs/t_renamerace::nfs_renamerace_dirs fs/vfs/t_rmdirrace::nfs_race fs/vfs/t_ro::nfs_attrs fs/vfs/t_ro::nfs_create fs/vfs/t_ro::nfs_createdir fs/vfs/t_ro::nfs_createfifo fs/vfs/t_ro::nfs_createlink fs/vfs/t_ro::nfs_createsymlink fs/vfs/t_ro::nfs_fileio fs/vfs/t_ro::nfs_rmfile fs/vfs/t_ro::nfsro_attrs fs/vfs/t_ro::nfsro_create fs/vfs/t_ro::nfsro_createdir fs/vfs/t_ro::nfsro_createfifo fs/vfs/t_ro::nfsro_createlink fs/vfs/t_ro::nfsro_createsymlink fs/vfs/t_ro::nfsro_fileio fs/vfs/t_ro::nfsro_rmfile fs/vfs/t_rwtoro::nfs_layer_noneopen fs/vfs/t_rwtoro::nfs_layer_read_unlinked fs/vfs/t_rwtoro::nfs_layer_readopen fs/vfs/t_rwtoro::nfs_layer_writeopen fs/vfs/t_rwtoro::nfs_noneopen fs/vfs/t_rwtoro::nfs_read_unlinked fs/vfs/t_rwtoro::nfs_readopen fs/vfs/t_rwtoro::nfs_writeopen fs/vfs/t_union::nfs_basic fs/vfs/t_union::nfs_whiteout fs/vfs/t_unpriv::nfs_dirperms fs/vfs/t_unpriv::nfs_flags fs/vfs/t_unpriv::nfs_owner fs/vfs/t_unpriv::nfs_times fs/vfs/t_vfsops::nfs_tfhinval fs/vfs/t_vfsops::nfs_tfhremove fs/vfs/t_vfsops::nfs_tfilehandle fs/vfs/t_vfsops::nfs_tmount fs/vfs/t_vfsops::nfs_tstatvfs fs/vfs/t_vfsops::nfs_tsync fs/vfs/t_vnops::nfs_access_simple fs/vfs/t_vnops::nfs_attrs fs/vfs/t_vnops::nfs_create_exist fs/vfs/t_vnops::nfs_create_many fs/vfs/t_vnops::nfs_create_nametoolong fs/vfs/t_vnops::nfs_create_nonalphanum fs/vfs/t_vnops::nfs_dir_notempty fs/vfs/t_vnops::nfs_dir_rmdirdotdot fs/vfs/t_vnops::nfs_dir_simple fs/vfs/t_vnops::nfs_fcntl_getlock_pids fs/vfs/t_vnops::nfs_fcntl_lock fs/vfs/t_vnops::nfs_lookup_complex fs/vfs/t_vnops::nfs_lookup_simple fs/vfs/t_vnops::nfs_lstat_symlink fs/vfs/t_vnops::nfs_read_directory fs/vfs/t_vnops::nfs_rename_dir fs/vfs/t_vnops::nfs_rename_dotdot fs/vfs/t_vnops::nfs_rename_nametoolong fs/vfs/t_vnops::nfs_rename_reg_nodir fs/vfs/t_vnops::nfs_symlink_long fs/vfs/t_vnops::nfs_symlink_root fs/vfs/t_vnops::nfs_symlink_zerolen signature.asc Description: Message signed with OpenPGP
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: kamil Date: Sun Jun 14 23:38:25 UTC 2020 Modified Files: src/sys/rump/include/rump: rump.h Log Message: Remove old compat include of rump_syscallshotgun.h It was separated in 2016 and is no longer needed. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/rump/include/rump/rump.h 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/rump.h diff -u src/sys/rump/include/rump/rump.h:1.71 src/sys/rump/include/rump/rump.h:1.72 --- src/sys/rump/include/rump/rump.h:1.71 Sun Jun 14 22:12:58 2020 +++ src/sys/rump/include/rump/rump.h Sun Jun 14 23:38:25 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.71 2020/06/14 22:12:58 kamil Exp $ */ +/* $NetBSD: rump.h,v 1.72 2020/06/14 23:38:25 kamil Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -133,11 +133,4 @@ int rump_daemonize_done(int); } #endif -/* - * Include macros prehistorically provided by this header. - * The inclusion might go away some year. Include the header directly - * if you want it to keep working for you. - */ -#include - #endif /* _RUMP_RUMP_H_ */
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: kamil Date: Sun Jun 14 23:38:25 UTC 2020 Modified Files: src/sys/rump/include/rump: rump.h Log Message: Remove old compat include of rump_syscallshotgun.h It was separated in 2016 and is no longer needed. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/rump/include/rump/rump.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: kamil Date: Sun Jun 14 22:12:58 UTC 2020 Modified Files: src/sys/rump/include/rump: rump.h Log Message: Fix header compatibility with C++ This file is OS-agnostic and cannot include OS specific headers. The fallback for NetBSD specific symbol __BEGIN_DECLS didn't work as it was misspelled as _BEGIN_DECLS. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/rump/include/rump/rump.h 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/rump.h diff -u src/sys/rump/include/rump/rump.h:1.70 src/sys/rump/include/rump/rump.h:1.71 --- src/sys/rump/include/rump/rump.h:1.70 Thu May 11 18:16:00 2017 +++ src/sys/rump/include/rump/rump.h Sun Jun 14 22:12:58 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.70 2017/05/11 18:16:00 christos Exp $ */ +/* $NetBSD: rump.h,v 1.71 2020/06/14 22:12:58 kamil Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -86,9 +86,8 @@ enum rump_etfs_type { RUMP_ETFS_DIR_SUBDIRS /* dir + subdirectories (recursive) */ }; -/* um, what's the point ?-) */ -#ifdef _BEGIN_DECLS -_BEGIN_DECLS +#if defined(__cplusplus) +extern "C" { #endif int rump_getversion(void); @@ -130,8 +129,8 @@ int rump_daemonize_done(int); #include #endif -#ifdef _END_DECLS -_END_DECLS +#if defined(__cplusplus) +} #endif /*
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: kamil Date: Sun Jun 14 22:12:58 UTC 2020 Modified Files: src/sys/rump/include/rump: rump.h Log Message: Fix header compatibility with C++ This file is OS-agnostic and cannot include OS specific headers. The fallback for NetBSD specific symbol __BEGIN_DECLS didn't work as it was misspelled as _BEGIN_DECLS. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/rump/include/rump/rump.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Tue Aug 21 11:47:37 UTC 2018 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h rumperrno2host.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.7 -r1.8 src/sys/rump/include/rump/rumperr.h cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/rump/rumperrno2host.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Tue Aug 21 11:47:37 UTC 2018 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h rumperrno2host.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.7 -r1.8 src/sys/rump/include/rump/rumperr.h cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/rump/rumperrno2host.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.37 src/sys/rump/include/rump/rumpdefs.h:1.38 --- src/sys/rump/include/rump/rumpdefs.h:1.37 Sat May 27 17:02:56 2017 +++ src/sys/rump/include/rump/rumpdefs.h Tue Aug 21 07:47:37 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.37 2017/05/27 21:02:56 bouyer Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.38 2018/08/21 11:47:37 christos Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -9,7 +9,7 @@ #include -/* NetBSD: fcntl.h,v 1.46 2013/09/15 10:41:20 njoly Exp */ +/* NetBSD: fcntl.h,v 1.50 2018/02/20 18:20:05 kamil Exp */ #define RUMP_O_RDONLY 0x /* open for reading only */ #define RUMP_O_WRONLY 0x0001 /* open for writing only */ #define RUMP_O_RDWR 0x0002 /* open for reading and writing */ @@ -32,6 +32,7 @@ #define RUMP_O_CLOEXEC 0x0040 /* set close on exec */ #define RUMP_O_SEARCH 0x0080 /* skip search permission checks */ #define RUMP_O_NOSIGPIPE 0x0100 /* don't deliver sigpipe */ +#define RUMP_O_REGULAR 0x0200 /* fail if not a regular file */ #define RUMP_F_WAIT 0x010 /* Wait until lock is granted */ #define RUMP_F_FLOCK 0x020 /* Use flock(2) semantics for lock */ #define RUMP_F_POSIX 0x040 /* Use POSIX semantics for lock */ @@ -58,7 +59,7 @@ #define RUMP__FCNW_FSPRIV(f, c, t) RUMP__FCN_FSPRIV(RUMP_F_FSOUT, (f), (c), (int)sizeof(t)) #define RUMP__FCNRW_FSPRIV(f, c, t) RUMP__FCN_FSPRIV(RUMP_F_FSINOUT, (f), (c), (int)sizeof(t)) -/* NetBSD: vnode.h,v 1.259 2016/01/23 16:08:20 christos Exp */ +/* NetBSD: vnode.h,v 1.280 2018/04/19 21:19:07 christos Exp */ enum rump_vtype { RUMP_VNON, RUMP_VREG, RUMP_VDIR, RUMP_VBLK, RUMP_VCHR, RUMP_VLNK, RUMP_VSOCK, RUMP_VFIFO, RUMP_VBAD }; #define RUMP_LK_SHARED 0x0001 #define RUMP_LK_EXCLUSIVE 0x0002 @@ -195,7 +196,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_AB_SILENT 0x0004 #define RUMP_AB_DEBUG 0x0008 -/* NetBSD: socket.h,v 1.118 2015/10/13 21:28:34 rjs Exp */ +/* NetBSD: socket.h,v 1.126 2018/07/31 13:20:34 rjs Exp */ #define RUMP_SOCK_STREAM 1 #define RUMP_SOCK_DGRAM 2 #define RUMP_SOCK_RAW 3 @@ -241,7 +242,8 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_AF_MPLS 33 #define RUMP_AF_ROUTE 34 #define RUMP_AF_CAN 35 -#define RUMP_AF_MAX 36 +#define RUMP_AF_ETHER 36 +#define RUMP_AF_MAX 37 #define RUMP_PF_UNSPEC RUMP_AF_UNSPEC #define RUMP_PF_LOCAL RUMP_AF_LOCAL #define RUMP_PF_UNIX RUMP_PF_LOCAL @@ -279,6 +281,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_PF_MPLS RUMP_AF_MPLS #define RUMP_PF_ROUTE RUMP_AF_ROUTE #define RUMP_PF_CAN RUMP_AF_CAN +#define RUMP_PF_ETHER RUMP_AF_ETHER #define RUMP_PF_MAX RUMP_AF_MAX #define RUMP_SO_DEBUG 0x0001 #define RUMP_SO_ACCEPTCONN 0x0002 @@ -325,7 +328,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_MSG_IOVUSRSPACE 0x400 #define RUMP_MSG_LENUSRSPACE 0x800 -/* NetBSD: in.h,v 1.98 2015/10/13 21:28:35 rjs Exp */ +/* NetBSD: in.h,v 1.106 2018/07/11 05:25:45 maxv Exp */ #define RUMP_IP_OPTIONS 1 #define RUMP_IP_HDRINCL 2 #define RUMP_IP_TOS 3 @@ -348,6 +351,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_IP_MINTTL 24 #define RUMP_IP_PKTINFO 25 #define RUMP_IP_RECVPKTINFO 26 +#define RUMP_IP_SENDSRCADDR RUMP_IP_RECVDSTADDR #define RUMP_IP_DEFAULT_MULTICAST_TTL 1 #define RUMP_IP_DEFAULT_MULTICAST_LOOP 1 #define RUMP_IP_MAX_MEMBERSHIPS 20 @@ -387,6 +391,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_IPPROTO_IPCOMP 108 #define RUMP_IPPROTO_VRRP 112 #define RUMP_IPPROTO_CARP 112 +#define RUMP_IPPROTO_L2TP 115 #define RUMP_IPPROTO_SCTP 132 #define RUMP_IPPROTO_PFSYNC 240 #define RUMP_IPPROTO_RAW 255 @@ -394,7 +399,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_IPPROTO_DONE 257 #define RUMP_IPPROTO_MAXID (RUMP_IPPROTO_AH + 1) -/* NetBSD: tcp.h,v 1.31 2015/02/14 12:57:53 he Exp */ +/* NetBSD: tcp.h,v 1.33 2017/01/10 20:32:27 christos Exp */ #define RUMP_TCP_MSS 536 #define RUMP_TCP_MINMSS 216 #define RUMP_TCP_MAXWIN 65535 @@ -412,7 +417,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_TCP_MD5SIG 0x10 #define RUMP_TCP_CONGCTL 0x20 -/* NetBSD: mount.h,v 1.218 2015/10/23 19:40:10 maxv Exp */ +/* NetBSD: mount.h,v 1.230 2018/01/09 03:31:13 christos Exp */ #define RUMP_MOUNT_FFS
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Tue Aug 21 11:45:23 UTC 2018 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Unlike gnu sed our sed does not recognize inline labels (separated by semi-colons) so split the lines, and make sure that command lists end with a semi-colon. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.30 src/sys/rump/include/rump/makerumpdefs.sh:1.31 --- src/sys/rump/include/rump/makerumpdefs.sh:1.30 Tue Aug 21 04:22:33 2018 +++ src/sys/rump/include/rump/makerumpdefs.sh Tue Aug 21 07:45:23 2018 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec 3>&1 > rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.30 2018/08/21 08:22:33 msaitoh Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.31 2018/08/21 11:45:23 christos Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -57,7 +57,13 @@ sed -n '/#define F_[A-Z_]* *0x/s/F_/RUMP < ../../../sys/fcntl.h sed -n '/#define F_[A-Z_]* *(/s/F_/RUMP_F_/gp' \ < ../../../sys/fcntl.h -sed -n '/#define[ ]*_FCN/{:t;N;/\\$/bt;s/_FCN/RUMP__FCN/g;s/F_[A-Z]/RUMP_&/gp}' <../../../sys/fcntl.h | sed 's,/\*.*$,,' +sed -n '/#define[ ]*_FCN/{ +:t +N +/\\$/bt +s/_FCN/RUMP__FCN/g +s/F_[A-Z]/RUMP_&/gp +}' <../../../sys/fcntl.h | sed 's,/\*.*$,,' fromvers ../../../sys/vnode.h sed -n '/enum vtype.*{/{s/vtype/rump_&/;s/ V/ RUMP_V/gp;}' <../../../sys/vnode.h @@ -104,9 +110,15 @@ sed -n '/#define[ ]*MNT_[A-Z].*[^\]$/s/ fromvers ../../../sys/ioccom.h sed -n '/#define[ ]*IOC[A-Z_].*[^\\]$/s/IOC/RUMP_&/gp' <../../../sys/ioccom.h | sed 's,/\*.*$,,' -sed -n '/#define[ ]*_IO.*\\$/{:t;N;/\\$/bt;s/_IOC/_RUMP_IOC/g;s/IOC[A-Z]/RUMP_&/gp}' <../../../sys/ioccom.h \ +sed -n '/#define[ ]*_IO.*\\$/{ +:t +N +/\\$/bt +s/_IOC/_RUMP_IOC/g +s/IOC[A-Z]/RUMP_&/gp +}' <../../../sys/ioccom.h \ | sed 's,/\*.*$,,' -sed -n '/#define[ ]*_IO.*[^\]$/{s/_IO/_RUMP_IO/g;s/IOC_/RUMP_IOC_/gp}' <../../../sys/ioccom.h \ +sed -n '/#define[ ]*_IO.*[^\]$/{s/_IO/_RUMP_IO/g;s/IOC_/RUMP_IOC_/gp;}' <../../../sys/ioccom.h \ | sed 's,/\*.*$,,' fromvers ../../../sys/ktrace.h @@ -135,7 +147,7 @@ exec 1>&3 echo Generating rumperr.h rm -f rumperr.h exec > rumperr.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.30 2018/08/21 08:22:33 msaitoh Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.31 2018/08/21 11:45:23 christos Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' fromvers ../../../sys/errno.h @@ -176,7 +188,7 @@ fi echo Generating rumperrno2host.h 1>&3 rm -f rumperrno2host.h exec > rumperrno2host.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.30 2018/08/21 08:22:33 msaitoh Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.31 2018/08/21 11:45:23 christos Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' fromvers ../../../sys/errno.h
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Tue Aug 21 11:45:23 UTC 2018 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Unlike gnu sed our sed does not recognize inline labels (separated by semi-colons) so split the lines, and make sure that command lists end with a semi-colon. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: msaitoh Date: Tue Aug 21 08:22:33 UTC 2018 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: rumpdefs.h, rumperr.h and rumperrno2host.h are generated from makerumpdefs.sh. Don't edit those files directly. Use __inline instead of inline in the script file. OK'd by christos. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.29 src/sys/rump/include/rump/makerumpdefs.sh:1.30 --- src/sys/rump/include/rump/makerumpdefs.sh:1.29 Tue Feb 2 01:15:24 2016 +++ src/sys/rump/include/rump/makerumpdefs.sh Tue Aug 21 08:22:33 2018 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec 3>&1 > rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.29 2016/02/02 01:15:24 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.30 2018/08/21 08:22:33 msaitoh Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -135,12 +135,12 @@ exec 1>&3 echo Generating rumperr.h rm -f rumperr.h exec > rumperr.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.29 2016/02/02 01:15:24 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.30 2018/08/21 08:22:33 msaitoh Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' fromvers ../../../sys/errno.h -printf "\nstatic inline const char *\nrump_strerror(int error)\n{\n\n" +printf "\nstatic __inline const char *\nrump_strerror(int error)\n{\n\n" printf "\tswitch (error) {\n\tcase 0:\n" printf "\t\t return \"No error: zero, zip, zilch, none!\";\n" awk '/^#define[ ]*E.*[0-9]/{ @@ -176,13 +176,13 @@ fi echo Generating rumperrno2host.h 1>&3 rm -f rumperrno2host.h exec > rumperrno2host.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.29 2016/02/02 01:15:24 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.30 2018/08/21 08:22:33 msaitoh Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' fromvers ../../../sys/errno.h printf "\n#ifndef ERANGE\n#error include ISO C style errno.h first\n#endif\n" -printf "\nstatic inline int \nrump_errno2host(int rumperrno)\n{\n\n" +printf "\nstatic __inline int \nrump_errno2host(int rumperrno)\n{\n\n" printf "\tswitch (rumperrno) {\n\tcase 0:\n" printf "\t\t return 0;\n" awk '/^#define[ ]*E.*[0-9]/{
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: msaitoh Date: Tue Aug 21 08:22:33 UTC 2018 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: rumpdefs.h, rumperr.h and rumperrno2host.h are generated from makerumpdefs.sh. Don't edit those files directly. Use __inline instead of inline in the script file. OK'd by christos. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Thu May 11 18:16:00 UTC 2017 Modified Files: src/sys/rump/include/rump: rump.h Log Message: ... but define RUMP_REGISTER_T if not defined. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/rump/include/rump/rump.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Thu May 11 18:16:00 UTC 2017 Modified Files: src/sys/rump/include/rump: rump.h Log Message: ... but define RUMP_REGISTER_T if not defined. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/rump/include/rump/rump.h 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/rump.h diff -u src/sys/rump/include/rump/rump.h:1.69 src/sys/rump/include/rump/rump.h:1.70 --- src/sys/rump/include/rump/rump.h:1.69 Thu May 11 14:08:10 2017 +++ src/sys/rump/include/rump/rump.h Thu May 11 14:16:00 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.69 2017/05/11 18:08:10 christos Exp $ */ +/* $NetBSD: rump.h,v 1.70 2017/05/11 18:16:00 christos Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -46,10 +46,12 @@ struct lwp; struct modinfo; struct uio; -#if !defined(RUMP_REGISTER_T) && !defined(_KERNEL) && \ -!defined(_KMEMUSER) && !defined(_KERNTYPES) && !defined(_STANDALONE) -#define RUMP_REGISTER_T long +#if !defined(RUMP_REGISTER_T) +# define RUMP_REGISTER_T long +# if !defined(_KERNEL) && !defined(_KMEMUSER) && \ +!defined(_KERNTYPES) && !defined(_STANDALONE) typedef RUMP_REGISTER_T register_t; +# endif #endif #include
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Thu May 11 18:08:10 UTC 2017 Modified Files: src/sys/rump/include/rump: rump.h Log Message: Use the same exposure rules for register_t as does. Eventually we could remove -D_KERNTYPES from all the rump libraries... To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/rump/include/rump/rump.h 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/rump.h diff -u src/sys/rump/include/rump/rump.h:1.68 src/sys/rump/include/rump/rump.h:1.69 --- src/sys/rump/include/rump/rump.h:1.68 Sun Jan 31 18:14:34 2016 +++ src/sys/rump/include/rump/rump.h Thu May 11 14:08:10 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.68 2016/01/31 23:14:34 pooka Exp $ */ +/* $NetBSD: rump.h,v 1.69 2017/05/11 18:08:10 christos Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -46,7 +46,8 @@ struct lwp; struct modinfo; struct uio; -#if (!defined(_KERNEL)) && (defined(__sun__) || defined(__ANDROID__)) && !defined(RUMP_REGISTER_T) +#if !defined(RUMP_REGISTER_T) && !defined(_KERNEL) && \ +!defined(_KMEMUSER) && !defined(_KERNTYPES) && !defined(_STANDALONE) #define RUMP_REGISTER_T long typedef RUMP_REGISTER_T register_t; #endif
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Thu May 11 18:08:10 UTC 2017 Modified Files: src/sys/rump/include/rump: rump.h Log Message: Use the same exposure rules for register_t as does. Eventually we could remove -D_KERNTYPES from all the rump libraries... To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/rump/include/rump/rump.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump-sys
Module Name:src Committed By: pooka Date: Tue Feb 2 13:07:30 UTC 2016 Modified Files: src/sys/rump/include/rump-sys: kern.h Log Message: Remove leading spaces. Bet you didn't see that one coming. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump-sys/kern.h 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-sys/kern.h diff -u src/sys/rump/include/rump-sys/kern.h:1.1 src/sys/rump/include/rump-sys/kern.h:1.2 --- src/sys/rump/include/rump-sys/kern.h:1.1 Tue Jan 26 23:12:17 2016 +++ src/sys/rump/include/rump-sys/kern.h Tue Feb 2 13:07:30 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: kern.h,v 1.1 2016/01/26 23:12:17 pooka Exp $ */ +/* $NetBSD: kern.h,v 1.2 2016/02/02 13:07:30 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -228,13 +228,13 @@ struct rump_sysproxy_ops { }; extern struct rump_sysproxy_ops rump_sysproxy_ops; #define rump_sysproxy_copyin(arg, raddr, laddr, len) \ - rump_sysproxy_ops.rspo_copyin(arg, raddr, laddr, len) + rump_sysproxy_ops.rspo_copyin(arg, raddr, laddr, len) #define rump_sysproxy_copyinstr(arg, raddr, laddr, lenp) \ - rump_sysproxy_ops.rspo_copyinstr(arg, raddr, laddr, lenp) + rump_sysproxy_ops.rspo_copyinstr(arg, raddr, laddr, lenp) #define rump_sysproxy_copyout(arg, laddr, raddr, len) \ - rump_sysproxy_ops.rspo_copyout(arg, laddr, raddr, len) + rump_sysproxy_ops.rspo_copyout(arg, laddr, raddr, len) #define rump_sysproxy_copyoutstr(arg, laddr, raddr, lenp) \ - rump_sysproxy_ops.rspo_copyoutstr(arg, laddr, raddr, lenp) + rump_sysproxy_ops.rspo_copyoutstr(arg, laddr, raddr, lenp) #define rump_sysproxy_anonmmap(arg, howmuch, addr) \ rump_sysproxy_ops.rspo_anonmmap(arg, howmuch, addr) #define rump_sysproxy_raise(arg, signo) \
CVS commit: src/sys/rump/include/rump-sys
Module Name:src Committed By: pooka Date: Tue Feb 2 13:07:30 UTC 2016 Modified Files: src/sys/rump/include/rump-sys: kern.h Log Message: Remove leading spaces. Bet you didn't see that one coming. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump-sys/kern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Feb 2 01:15:24 UTC 2016 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: snarf fcntl definitions To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.28 src/sys/rump/include/rump/makerumpdefs.sh:1.29 --- src/sys/rump/include/rump/makerumpdefs.sh:1.28 Tue Sep 15 14:55:12 2015 +++ src/sys/rump/include/rump/makerumpdefs.sh Tue Feb 2 01:15:24 2016 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec 3>&1 > rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.28 2015/09/15 14:55:12 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.29 2016/02/02 01:15:24 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -53,6 +53,11 @@ enum rump_'"$2"' { fromvers ../../../sys/fcntl.h sed -n '/#define O_[A-Z]* *0x/s/O_/RUMP_O_/gp' \ < ../../../sys/fcntl.h +sed -n '/#define F_[A-Z_]* *0x/s/F_/RUMP_F_/gp' \ +< ../../../sys/fcntl.h +sed -n '/#define F_[A-Z_]* *(/s/F_/RUMP_F_/gp' \ +< ../../../sys/fcntl.h +sed -n '/#define[ ]*_FCN/{:t;N;/\\$/bt;s/_FCN/RUMP__FCN/g;s/F_[A-Z]/RUMP_&/gp}' <../../../sys/fcntl.h | sed 's,/\*.*$,,' fromvers ../../../sys/vnode.h sed -n '/enum vtype.*{/{s/vtype/rump_&/;s/ V/ RUMP_V/gp;}' <../../../sys/vnode.h @@ -130,7 +135,7 @@ exec 1>&3 echo Generating rumperr.h rm -f rumperr.h exec > rumperr.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.28 2015/09/15 14:55:12 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.29 2016/02/02 01:15:24 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' fromvers ../../../sys/errno.h @@ -171,7 +176,7 @@ fi echo Generating rumperrno2host.h 1>&3 rm -f rumperrno2host.h exec > rumperrno2host.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.28 2015/09/15 14:55:12 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.29 2016/02/02 01:15:24 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' fromvers ../../../sys/errno.h
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Feb 2 01:14:26 UTC 2016 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h rumperrno2host.h Log Message: periodic regen (because having new rcs ids in comments is most useful) To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/rump/rumperr.h cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump/rumperrno2host.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.34 src/sys/rump/include/rump/rumpdefs.h:1.35 --- src/sys/rump/include/rump/rumpdefs.h:1.34 Thu Jan 7 13:54:08 2016 +++ src/sys/rump/include/rump/rumpdefs.h Tue Feb 2 01:14:26 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.34 2016/01/07 13:54:08 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.35 2016/02/02 01:14:26 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -33,7 +33,7 @@ #define RUMP_O_SEARCH 0x0080 /* skip search permission checks */ #define RUMP_O_NOSIGPIPE 0x0100 /* don't deliver sigpipe */ -/* NetBSD: vnode.h,v 1.256 2015/07/12 08:11:28 hannken Exp */ +/* NetBSD: vnode.h,v 1.259 2016/01/23 16:08:20 christos Exp */ enum rump_vtype { RUMP_VNON, RUMP_VREG, RUMP_VDIR, RUMP_VBLK, RUMP_VCHR, RUMP_VLNK, RUMP_VSOCK, RUMP_VFIFO, RUMP_VBAD }; #define RUMP_LK_SHARED 0x0001 #define RUMP_LK_EXCLUSIVE 0x0002 @@ -478,7 +478,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define _RUMP_IOW(g,n,t) _RUMP_IOC(RUMP_IOC_IN, (g), (n), sizeof(t)) #define _RUMP_IOWR(g,n,t) _RUMP_IOC(RUMP_IOC_INOUT, (g), (n), sizeof(t)) -/* NetBSD: ktrace.h,v 1.61 2013/12/09 17:43:58 pooka Exp */ +/* NetBSD: ktrace.h,v 1.62 2016/01/23 21:19:24 christos Exp */ #define RUMP_KTROP_SET 0 #define RUMP_KTROP_CLEAR 1 #define RUMP_KTROP_CLEARFILE 2 @@ -522,7 +522,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_KTRFACv1 (1 << RUMP_KTRFAC_VER_SHIFT) #define RUMP_KTRFACv2 (2 << RUMP_KTRFAC_VER_SHIFT) -/* NetBSD: module.h,v 1.39 2015/11/04 04:28:58 pgoyette Exp */ +/* NetBSD: module.h,v 1.40 2016/01/18 16:46:08 pooka Exp */ struct rump_modctl_load { const char *ml_filename; @@ -548,7 +548,7 @@ struct rump_sysvbfs_args { char *fspec; /* blocks special holding the fs to mount */ }; -/* NetBSD: dirent.h,v 1.29 2015/02/26 02:05:54 dholland Exp */ +/* NetBSD: dirent.h,v 1.30 2016/01/22 23:31:30 dholland Exp */ struct rump_dirent { uint64_t d_fileno; /* file number of entry */ uint16_t d_reclen; /* length of this record */ Index: src/sys/rump/include/rump/rumperr.h diff -u src/sys/rump/include/rump/rumperr.h:1.4 src/sys/rump/include/rump/rumperr.h:1.5 --- src/sys/rump/include/rump/rumperr.h:1.4 Tue Sep 15 14:55:55 2015 +++ src/sys/rump/include/rump/rumperr.h Tue Feb 2 01:14:26 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rumperr.h,v 1.4 2015/09/15 14:55:55 pooka Exp $ */ +/* $NetBSD: rumperr.h,v 1.5 2016/02/02 01:14:26 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. Index: src/sys/rump/include/rump/rumperrno2host.h diff -u src/sys/rump/include/rump/rumperrno2host.h:1.1 src/sys/rump/include/rump/rumperrno2host.h:1.2 --- src/sys/rump/include/rump/rumperrno2host.h:1.1 Tue Sep 15 14:55:55 2015 +++ src/sys/rump/include/rump/rumperrno2host.h Tue Feb 2 01:14:26 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rumperrno2host.h,v 1.1 2015/09/15 14:55:55 pooka Exp $ */ +/* $NetBSD: rumperrno2host.h,v 1.2 2016/02/02 01:14:26 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Feb 2 01:14:26 UTC 2016 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h rumperrno2host.h Log Message: periodic regen (because having new rcs ids in comments is most useful) To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/rump/rumperr.h cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump/rumperrno2host.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Feb 2 01:15:24 UTC 2016 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: snarf fcntl definitions To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Feb 2 01:15:58 UTC 2016 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h rumperrno2host.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.5 -r1.6 src/sys/rump/include/rump/rumperr.h cvs rdiff -u -r1.2 -r1.3 src/sys/rump/include/rump/rumperrno2host.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.35 src/sys/rump/include/rump/rumpdefs.h:1.36 --- src/sys/rump/include/rump/rumpdefs.h:1.35 Tue Feb 2 01:14:26 2016 +++ src/sys/rump/include/rump/rumpdefs.h Tue Feb 2 01:15:58 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.35 2016/02/02 01:14:26 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.36 2016/02/02 01:15:58 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -32,6 +32,31 @@ #define RUMP_O_CLOEXEC 0x0040 /* set close on exec */ #define RUMP_O_SEARCH 0x0080 /* skip search permission checks */ #define RUMP_O_NOSIGPIPE 0x0100 /* don't deliver sigpipe */ +#define RUMP_F_WAIT 0x010 /* Wait until lock is granted */ +#define RUMP_F_FLOCK 0x020 /* Use flock(2) semantics for lock */ +#define RUMP_F_POSIX 0x040 /* Use POSIX semantics for lock */ +#define RUMP_F_PARAM_MASK 0xfff +#define RUMP_F_PARAM_LEN(x) (((x) >> 16) & RUMP_F_PARAM_MASK) +#define RUMP_F_FSCTL (int)0x8000 /* This fcntl goes to the fs */ +#define RUMP_F_FSVOID (int)0x4000 /* no parameters */ +#define RUMP_F_FSOUT (int)0x2000 /* copy out parameter */ +#define RUMP_F_FSIN (int)0x1000 /* copy in parameter */ +#define RUMP_F_FSINOUT (RUMP_F_FSIN | RUMP_F_FSOUT) +#define RUMP_F_FSDIRMASK (int)0x7000 /* mask for IN/OUT/VOID */ +#define RUMP_F_FSPRIV (int)0x8000 /* command is fs-specific */ +#define RUMP__FCN(inout, num, len) \ + (RUMP_F_FSCTL | inout | ((len & RUMP_F_PARAM_MASK) << 16) | (num)) +#define RUMP__FCNO(c) RUMP__FCN(RUMP_F_FSVOID, (c), 0) +#define RUMP__FCNR(c, t) RUMP__FCN(RUMP_F_FSIN, (c), (int)sizeof(t)) +#define RUMP__FCNW(c, t) RUMP__FCN(RUMP_F_FSOUT, (c), (int)sizeof(t)) +#define RUMP__FCNRW(c, t) RUMP__FCN(RUMP_F_FSINOUT, (c), (int)sizeof(t)) +#define RUMP__FCN_FSPRIV(inout, fs, num, len) \ + (RUMP_F_FSCTL | RUMP_F_FSPRIV | inout | ((len & RUMP_F_PARAM_MASK) << 16) | \ + (fs) << 8 | (num)) +#define RUMP__FCNO_FSPRIV(f, c) RUMP__FCN_FSPRIV(RUMP_F_FSVOID, (f), (c), 0) +#define RUMP__FCNR_FSPRIV(f, c, t) RUMP__FCN_FSPRIV(RUMP_F_FSIN,(f), (c), (int)sizeof(t)) +#define RUMP__FCNW_FSPRIV(f, c, t) RUMP__FCN_FSPRIV(RUMP_F_FSOUT, (f), (c), (int)sizeof(t)) +#define RUMP__FCNRW_FSPRIV(f, c, t) RUMP__FCN_FSPRIV(RUMP_F_FSINOUT, (f), (c), (int)sizeof(t)) /* NetBSD: vnode.h,v 1.259 2016/01/23 16:08:20 christos Exp */ enum rump_vtype { RUMP_VNON, RUMP_VREG, RUMP_VDIR, RUMP_VBLK, RUMP_VCHR, RUMP_VLNK, RUMP_VSOCK, RUMP_VFIFO, RUMP_VBAD }; Index: src/sys/rump/include/rump/rumperr.h diff -u src/sys/rump/include/rump/rumperr.h:1.5 src/sys/rump/include/rump/rumperr.h:1.6 --- src/sys/rump/include/rump/rumperr.h:1.5 Tue Feb 2 01:14:26 2016 +++ src/sys/rump/include/rump/rumperr.h Tue Feb 2 01:15:58 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rumperr.h,v 1.5 2016/02/02 01:14:26 pooka Exp $ */ +/* $NetBSD: rumperr.h,v 1.6 2016/02/02 01:15:58 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. Index: src/sys/rump/include/rump/rumperrno2host.h diff -u src/sys/rump/include/rump/rumperrno2host.h:1.2 src/sys/rump/include/rump/rumperrno2host.h:1.3 --- src/sys/rump/include/rump/rumperrno2host.h:1.2 Tue Feb 2 01:14:26 2016 +++ src/sys/rump/include/rump/rumperrno2host.h Tue Feb 2 01:15:58 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rumperrno2host.h,v 1.2 2016/02/02 01:14:26 pooka Exp $ */ +/* $NetBSD: rumperrno2host.h,v 1.3 2016/02/02 01:15:58 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Feb 2 01:15:58 UTC 2016 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h rumperrno2host.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.5 -r1.6 src/sys/rump/include/rump/rumperr.h cvs rdiff -u -r1.2 -r1.3 src/sys/rump/include/rump/rumperrno2host.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Fri Jan 29 20:35:48 UTC 2016 Modified Files: src/sys/rump/include/rump: rump.h Log Message: PR/50631: Joerg Sonnenberger: Don't rename syscalls before you include the relevant headers. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/rump/include/rump/rump.h 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/rump.h diff -u src/sys/rump/include/rump/rump.h:1.66 src/sys/rump/include/rump/rump.h:1.67 --- src/sys/rump/include/rump/rump.h:1.66 Mon Jan 25 07:25:38 2016 +++ src/sys/rump/include/rump/rump.h Fri Jan 29 15:35:48 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.66 2016/01/25 12:25:38 pooka Exp $ */ +/* $NetBSD: rump.h,v 1.67 2016/01/29 20:35:48 christos Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -136,6 +136,7 @@ _END_DECLS * is required here. */ #ifdef RUMP_SYS_NETWORKING +#include #define socket(a,b,c) rump_sys_socket(a,b,c) #define accept(a,b,c) rump_sys_accept(a,b,c) #define bind(a,b,c) rump_sys_bind(a,b,c) @@ -153,19 +154,23 @@ _END_DECLS #endif /* RUMP_SYS_NETWORKING */ #ifdef RUMP_SYS_IOCTL +#include #define ioctl(...) rump_sys_ioctl(__VA_ARGS__) #define fcntl(...) rump_sys_fcntl(__VA_ARGS__) #endif /* RUMP_SYS_IOCTL */ #ifdef RUMP_SYS_CLOSE +#include #define close(a) rump_sys_close(a) #endif /* RUMP_SYS_CLOSE */ #ifdef RUMP_SYS_OPEN +#include #define open(...) rump_sys_open(__VA_ARGS__) #endif /* RUMP_SYS_OPEN */ #ifdef RUMP_SYS_READWRITE +#include #define read(a,b,c) rump_sys_read(a,b,c) #define readv(a,b,c) rump_sys_readv(a,b,c) #define pread(a,b,c,d) rump_sys_pread(a,b,c,d) @@ -177,6 +182,8 @@ _END_DECLS #endif /* RUMP_SYS_READWRITE */ #ifdef RUMP_SYS_FILEOPS +#include +#include #define mkdir(a,b) rump_sys_mkdir(a,b) #define rmdir(a) rump_sys_rmdir(a) #define link(a,b) rump_sys_link(a,b) @@ -199,12 +206,14 @@ _END_DECLS #endif /* RUMP_SYS_FILEOPS */ #ifdef RUMP_SYS_STAT +#include #define stat(a,b) rump_sys_stat(a,b) #define fstat(a,b) rump_sys_fstat(a,b) #define lstat(a,b) rump_sys_lstat(a,b) #endif /* RUMP_SYS_STAT */ #ifdef RUMP_SYS_PROCOPS +#include #define getpid() rump_sys_getpid() #endif /* RUMP_SYS_PROCOPS */
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Fri Jan 29 20:35:48 UTC 2016 Modified Files: src/sys/rump/include/rump: rump.h Log Message: PR/50631: Joerg Sonnenberger: Don't rename syscalls before you include the relevant headers. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/rump/include/rump/rump.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Mon Jan 25 12:25:38 UTC 2016 Modified Files: src/sys/rump/include/rump: rump.h Log Message: prop_dictionary_t hasn't been needed here in, um, 5 years, so remove the type madness. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/rump/include/rump/rump.h 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/rump.h diff -u src/sys/rump/include/rump/rump.h:1.65 src/sys/rump/include/rump/rump.h:1.66 --- src/sys/rump/include/rump/rump.h:1.65 Mon Jan 25 11:45:57 2016 +++ src/sys/rump/include/rump/rump.h Mon Jan 25 12:25:38 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.65 2016/01/25 11:45:57 pooka Exp $ */ +/* $NetBSD: rump.h,v 1.66 2016/01/25 12:25:38 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -46,17 +46,6 @@ struct lwp; struct modinfo; struct uio; -/* yetch */ -#if defined(__NetBSD__) -#include -#else -#ifndef HAVE_PROP_DICTIONARY_T -#define HAVE_PROP_DICTIONARY_T -struct prop_dictionary; -typedef struct prop_dictionary *prop_dictionary_t; -#endif -#endif /* __NetBSD__ */ - #if (!defined(_KERNEL)) && (defined(__sun__) || defined(__ANDROID__)) && !defined(RUMP_REGISTER_T) #define RUMP_REGISTER_T long typedef RUMP_REGISTER_T register_t;
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Mon Jan 25 12:25:38 UTC 2016 Modified Files: src/sys/rump/include/rump: rump.h Log Message: prop_dictionary_t hasn't been needed here in, um, 5 years, so remove the type madness. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/rump/include/rump/rump.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Jan 7 13:54:08 UTC 2016 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.33 src/sys/rump/include/rump/rumpdefs.h:1.34 --- src/sys/rump/include/rump/rumpdefs.h:1.33 Tue Sep 15 14:55:55 2015 +++ src/sys/rump/include/rump/rumpdefs.h Thu Jan 7 13:54:08 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.33 2015/09/15 14:55:55 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.34 2016/01/07 13:54:08 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -170,7 +170,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_AB_SILENT 0x0004 #define RUMP_AB_DEBUG 0x0008 -/* NetBSD: socket.h,v 1.117 2015/04/03 20:01:08 rtr Exp */ +/* NetBSD: socket.h,v 1.118 2015/10/13 21:28:34 rjs Exp */ #define RUMP_SOCK_STREAM 1 #define RUMP_SOCK_DGRAM 2 #define RUMP_SOCK_RAW 3 @@ -291,13 +291,14 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_MSG_CRUMP_MSG_CLOEXEC 0x0800 #define RUMP_MSG_NBIO 0x1000 #define RUMP_MSG_WAITFORONE 0x2000 +#define RUMP_MSG_NOTIFICATION 0x4000 #define RUMP_MSG_USERFLAGS 0x0ff #define RUMP_MSG_NAMEMBUF 0x100 #define RUMP_MSG_CONTROLMBUF 0x200 #define RUMP_MSG_IOVUSRSPACE 0x400 #define RUMP_MSG_LENUSRSPACE 0x800 -/* NetBSD: in.h,v 1.97 2015/05/02 14:41:32 roy Exp */ +/* NetBSD: in.h,v 1.98 2015/10/13 21:28:35 rjs Exp */ #define RUMP_IP_OPTIONS 1 #define RUMP_IP_HDRINCL 2 #define RUMP_IP_TOS 3 @@ -359,6 +360,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_IPPROTO_IPCOMP 108 #define RUMP_IPPROTO_VRRP 112 #define RUMP_IPPROTO_CARP 112 +#define RUMP_IPPROTO_SCTP 132 #define RUMP_IPPROTO_PFSYNC 240 #define RUMP_IPPROTO_RAW 255 #define RUMP_IPPROTO_MAX 256 @@ -383,7 +385,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_TCP_MD5SIG 0x10 #define RUMP_TCP_CONGCTL 0x20 -/* NetBSD: mount.h,v 1.217 2015/05/06 15:57:08 hannken Exp */ +/* NetBSD: mount.h,v 1.218 2015/10/23 19:40:10 maxv Exp */ #define RUMP_MOUNT_FFS "ffs" #define RUMP_MOUNT_UFS RUMP_MOUNT_FFS #define RUMP_MOUNT_NFS "nfs" @@ -520,7 +522,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_KTRFACv1 (1 << RUMP_KTRFAC_VER_SHIFT) #define RUMP_KTRFACv2 (2 << RUMP_KTRFAC_VER_SHIFT) -/* NetBSD: module.h,v 1.38 2015/06/22 16:35:13 matt Exp */ +/* NetBSD: module.h,v 1.39 2015/11/04 04:28:58 pgoyette Exp */ struct rump_modctl_load { const char *ml_filename;
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Sun Nov 1 12:34:28 UTC 2015 Modified Files: src/sys/rump/include/rump: rump.h Log Message: fix typo: fnctl -> fcntl from Robert Millanvia rumpkernel-users To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/rump/include/rump/rump.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Sun Nov 1 12:34:28 UTC 2015 Modified Files: src/sys/rump/include/rump: rump.h Log Message: fix typo: fnctl -> fcntl from Robert Millanvia rumpkernel-users To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/rump/include/rump/rump.h 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/rump.h diff -u src/sys/rump/include/rump/rump.h:1.63 src/sys/rump/include/rump/rump.h:1.64 --- src/sys/rump/include/rump/rump.h:1.63 Fri Jun 13 15:45:02 2014 +++ src/sys/rump/include/rump/rump.h Sun Nov 1 12:34:28 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.63 2014/06/13 15:45:02 pooka Exp $ */ +/* $NetBSD: rump.h,v 1.64 2015/11/01 12:34:28 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -166,7 +166,7 @@ _END_DECLS #ifdef RUMP_SYS_IOCTL #define ioctl(...) rump_sys_ioctl(__VA_ARGS__) -#define fnctl(...) rump_sys_fcntl(__VA_ARGS__) +#define fcntl(...) rump_sys_fcntl(__VA_ARGS__) #endif /* RUMP_SYS_IOCTL */ #ifdef RUMP_SYS_CLOSE
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Sep 15 14:55:12 UTC 2015 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Generate rump_errno2host(): translates rump kernel errnos to host errnos. Essentially, it's a partial I-know-what-I'm-doing syscall compat. Functionality requested by Robert Millan. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Sep 15 14:55:55 UTC 2015 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h Added Files: src/sys/rump/include/rump: rumperrno2host.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.3 -r1.4 src/sys/rump/include/rump/rumperr.h cvs rdiff -u -r0 -r1.1 src/sys/rump/include/rump/rumperrno2host.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.32 src/sys/rump/include/rump/rumpdefs.h:1.33 --- src/sys/rump/include/rump/rumpdefs.h:1.32 Thu Sep 10 16:21:48 2015 +++ src/sys/rump/include/rump/rumpdefs.h Tue Sep 15 14:55:55 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.32 2015/09/10 16:21:48 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.33 2015/09/15 14:55:55 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. Index: src/sys/rump/include/rump/rumperr.h diff -u src/sys/rump/include/rump/rumperr.h:1.3 src/sys/rump/include/rump/rumperr.h:1.4 --- src/sys/rump/include/rump/rumperr.h:1.3 Thu Sep 10 16:21:48 2015 +++ src/sys/rump/include/rump/rumperr.h Tue Sep 15 14:55:55 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumperr.h,v 1.3 2015/09/10 16:21:48 pooka Exp $ */ +/* $NetBSD: rumperr.h,v 1.4 2015/09/15 14:55:55 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. Added files: Index: src/sys/rump/include/rump/rumperrno2host.h diff -u /dev/null src/sys/rump/include/rump/rumperrno2host.h:1.1 --- /dev/null Tue Sep 15 14:55:55 2015 +++ src/sys/rump/include/rump/rumperrno2host.h Tue Sep 15 14:55:55 2015 @@ -0,0 +1,411 @@ +/* $NetBSD: rumperrno2host.h,v 1.1 2015/09/15 14:55:55 pooka Exp $ */ + +/* + * AUTOMATICALLY GENERATED. DO NOT EDIT. + */ + +/* NetBSD: errno.h,v 1.40 2013/01/02 18:51:53 dsl Exp */ + +#ifndef ERANGE +#error include ISO C style errno.h first +#endif + +static inline int +rump_errno2host(int rumperrno) +{ + + switch (rumperrno) { + case 0: + return 0; +#ifdef EPERM + case 1: + return EPERM; +#endif +#ifdef ENOENT + case 2: + return ENOENT; +#endif +#ifdef ESRCH + case 3: + return ESRCH; +#endif +#ifdef EINTR + case 4: + return EINTR; +#endif +#ifdef EIO + case 5: + return EIO; +#endif +#ifdef ENXIO + case 6: + return ENXIO; +#endif +#ifdef E2BIG + case 7: + return E2BIG; +#endif +#ifdef ENOEXEC + case 8: + return ENOEXEC; +#endif +#ifdef EBADF + case 9: + return EBADF; +#endif +#ifdef ECHILD + case 10: + return ECHILD; +#endif +#ifdef EDEADLK + case 11: + return EDEADLK; +#endif +#ifdef ENOMEM + case 12: + return ENOMEM; +#endif +#ifdef EACCES + case 13: + return EACCES; +#endif +#ifdef EFAULT + case 14: + return EFAULT; +#endif +#ifdef ENOTBLK + case 15: + return ENOTBLK; +#endif +#ifdef EBUSY + case 16: + return EBUSY; +#endif +#ifdef EEXIST + case 17: + return EEXIST; +#endif +#ifdef EXDEV + case 18: + return EXDEV; +#endif +#ifdef ENODEV + case 19: + return ENODEV; +#endif +#ifdef ENOTDIR + case 20: + return ENOTDIR; +#endif +#ifdef EISDIR + case 21: + return EISDIR; +#endif +#ifdef EINVAL + case 22: + return EINVAL; +#endif +#ifdef ENFILE + case 23: + return ENFILE; +#endif +#ifdef EMFILE + case 24: + return EMFILE; +#endif +#ifdef ENOTTY + case 25: + return ENOTTY; +#endif +#ifdef ETXTBSY + case 26: + return ETXTBSY; +#endif +#ifdef EFBIG + case 27: + return EFBIG; +#endif +#ifdef ENOSPC + case 28: + return ENOSPC; +#endif +#ifdef ESPIPE + case 29: + return ESPIPE; +#endif +#ifdef EROFS + case 30: + return EROFS; +#endif +#ifdef EMLINK + case 31: + return EMLINK; +#endif +#ifdef EPIPE + case 32: + return EPIPE; +#endif +#ifdef EDOM + case 33: + return EDOM; +#endif +#ifdef ERANGE + case 34: + return ERANGE; +#endif +#ifdef EAGAIN + case 35: + return EAGAIN; +#endif +#ifdef EINPROGRESS + case 36: + return EINPROGRESS; +#endif +#ifdef EALREADY + case 37: + return EALREADY; +#endif +#ifdef ENOTSOCK + case 38: + return ENOTSOCK; +#endif +#ifdef EDESTADDRREQ + case 39: + return EDESTADDRREQ; +#endif +#ifdef EMSGSIZE + case 40: + return EMSGSIZE; +#endif +#ifdef EPROTOTYPE + case 41: + return EPROTOTYPE; +#endif +#ifdef ENOPROTOOPT + case 42: + return ENOPROTOOPT; +#endif +#ifdef EPROTONOSUPPORT + case 43: + return EPROTONOSUPPORT; +#endif +#ifdef ESOCKTNOSUPPORT + case 44: + return ESOCKTNOSUPPORT; +#endif +#ifdef EOPNOTSUPP + case 45: + return EOPNOTSUPP; +#endif +#ifdef EPFNOSUPPORT + case 46: + return EPFNOSUPPORT; +#endif +#ifdef EAFNOSUPPORT + case 47: + return EAFNOSUPPORT; +#endif +#ifdef EADDRINUSE + case 48: + return EADDRINUSE; +#endif +#ifdef EADDRNOTAVAIL + case 49: + return EADDRNOTAVAIL; +#endif +#ifdef ENETDOWN + case 50: + return ENETDOWN; +#endif +#ifdef ENETUNREACH + case 51: + return ENETUNREACH; +#endif +#ifdef ENETRESET + case 52: + return ENETRESET; +#endif +#ifdef
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Sep 15 14:55:12 UTC 2015 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Generate rump_errno2host(): translates rump kernel errnos to host errnos. Essentially, it's a partial I-know-what-I'm-doing syscall compat. Functionality requested by Robert Millan. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.27 src/sys/rump/include/rump/makerumpdefs.sh:1.28 --- src/sys/rump/include/rump/makerumpdefs.sh:1.27 Thu Sep 10 16:21:32 2015 +++ src/sys/rump/include/rump/makerumpdefs.sh Tue Sep 15 14:55:12 2015 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec 3>&1 > rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.27 2015/09/10 16:21:32 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.28 2015/09/15 14:55:12 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -126,11 +126,11 @@ getstruct ../../../sys/dirent.h dirent printf '\n#endif /* _RUMP_RUMPDEFS_H_ */\n' exec 1>&3 + echo Generating rumperr.h rm -f rumperr.h exec > rumperr.h - -printf '/* $NetBSD: makerumpdefs.sh,v 1.27 2015/09/10 16:21:32 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.28 2015/09/15 14:55:12 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' fromvers ../../../sys/errno.h @@ -168,4 +168,44 @@ if [ $? -ne 0 ]; then exit 1 fi +echo Generating rumperrno2host.h 1>&3 +rm -f rumperrno2host.h +exec > rumperrno2host.h +printf '/* $NetBSD: makerumpdefs.sh,v 1.28 2015/09/15 14:55:12 pooka Exp $ */\n\n' +printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' + +fromvers ../../../sys/errno.h + +printf "\n#ifndef ERANGE\n#error include ISO C style errno.h first\n#endif\n" +printf "\nstatic inline int \nrump_errno2host(int rumperrno)\n{\n\n" +printf "\tswitch (rumperrno) {\n\tcase 0:\n" +printf "\t\t return 0;\n" +awk '/^#define[ ]*E.*[0-9]/{ + ename = $2 + evalue = $3 + error = 1 + if (ename == "ELAST") { + printf "\tdefault:\n" + printf "#ifdef EINVAL\n\t\treturn EINVAL;\n" + printf "#else\n\t\treturn ERANGE;\n#endif\n" + printf "\t}\n}\n" + error = 0 + exit 0 + } + if (preverror + 1 != evalue) + exit 1 + preverror = evalue + printf "#ifdef %s\n", ename + printf "\tcase %d:\n\t\treturn %s;\n", evalue, ename + printf "#endif\n" +} +END { + exit error +}' < ../../../sys/errno.h +if [ $? -ne 0 ]; then + echo 'Parsing errno.h failed!' 1>&3 + rm -f rumpdefs.h rumperr.h rumperrno2host.h + exit 1 +fi + exit 0
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Sep 15 14:55:55 UTC 2015 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h Added Files: src/sys/rump/include/rump: rumperrno2host.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.3 -r1.4 src/sys/rump/include/rump/rumperr.h cvs rdiff -u -r0 -r1.1 src/sys/rump/include/rump/rumperrno2host.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Sep 10 16:21:48 UTC 2015 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.2 -r1.3 src/sys/rump/include/rump/rumperr.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.31 src/sys/rump/include/rump/rumpdefs.h:1.32 --- src/sys/rump/include/rump/rumpdefs.h:1.31 Thu Sep 10 16:16:35 2015 +++ src/sys/rump/include/rump/rumpdefs.h Thu Sep 10 16:21:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.31 2015/09/10 16:16:35 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.32 2015/09/10 16:21:48 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -76,7 +76,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_EDOM 33 /* Numerical argument out of domain */ #define RUMP_ERANGE 34 /* Result too large or too small */ #define RUMP_EAGAIN 35 /* Resource temporarily unavailable */ -#define RUMP_EWOULDBLOCK EAGAIN /* Operation would block */ +#define RUMP_EWOULDBLOCK RUMP_EAGAIN /* Operation would block */ #define RUMP_EINPROGRESS 36 /* Operation now in progress */ #define RUMP_EALREADY 37 /* Operation already in progress */ #define RUMP_ENOTSOCK 38 /* Socket operation on non-socket */ Index: src/sys/rump/include/rump/rumperr.h diff -u src/sys/rump/include/rump/rumperr.h:1.2 src/sys/rump/include/rump/rumperr.h:1.3 --- src/sys/rump/include/rump/rumperr.h:1.2 Thu Sep 10 16:16:35 2015 +++ src/sys/rump/include/rump/rumperr.h Thu Sep 10 16:21:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumperr.h,v 1.2 2015/09/10 16:16:35 pooka Exp $ */ +/* $NetBSD: rumperr.h,v 1.3 2015/09/10 16:21:48 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Sep 10 16:14:22 UTC 2015 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Ignore multiline IOC macros by default. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Sep 10 16:14:22 UTC 2015 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Ignore multiline IOC macros by default. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.25 src/sys/rump/include/rump/makerumpdefs.sh:1.26 --- src/sys/rump/include/rump/makerumpdefs.sh:1.25 Wed Dec 18 20:10:58 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Thu Sep 10 16:14:22 2015 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec 3>&1 > rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.25 2013/12/18 20:10:58 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.26 2015/09/10 16:14:22 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -97,7 +97,7 @@ fromvers ../../../sys/fstypes.h sed -n '/#define[ ]*MNT_[A-Z].*[^\]$/s/MNT_/RUMP_MNT_/gp' <../../../sys/fstypes.h | sed 's,/\*.*$,,' fromvers ../../../sys/ioccom.h -sed -n '/#define[ ]*IOC[A-Z_]/s/IOC/RUMP_&/gp' <../../../sys/ioccom.h | sed 's,/\*.*$,,' +sed -n '/#define[ ]*IOC[A-Z_].*[^\\]$/s/IOC/RUMP_&/gp' <../../../sys/ioccom.h | sed 's,/\*.*$,,' sed -n '/#define[ ]*_IO.*\\$/{:t;N;/\\$/bt;s/_IOC/_RUMP_IOC/g;s/IOC[A-Z]/RUMP_&/gp}' <../../../sys/ioccom.h \ | sed 's,/\*.*$,,' sed -n '/#define[ ]*_IO.*[^\]$/{s/_IO/_RUMP_IO/g;s/IOC_/RUMP_IOC_/gp}' <../../../sys/ioccom.h \ @@ -129,7 +129,7 @@ echo Generating rumperr.h rm -f rumperr.h exec > rumperr.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.25 2013/12/18 20:10:58 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.26 2015/09/10 16:14:22 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' fromvers ../../../sys/errno.h
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Sep 10 16:21:32 UTC 2015 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Fix #define ERRNO EANOTHERRNO. Was: #define RUMP_ERRNO EANOTHERRNO Now: #define RUMP_ERRNO RUMP_EANOTHERRNO pointed out by Sebastian Wicki on irc To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Sep 10 16:16:35 UTC 2015 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump/rumperr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Sep 10 16:16:35 UTC 2015 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump/rumperr.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.30 src/sys/rump/include/rump/rumpdefs.h:1.31 --- src/sys/rump/include/rump/rumpdefs.h:1.30 Wed Dec 18 20:12:08 2013 +++ src/sys/rump/include/rump/rumpdefs.h Thu Sep 10 16:16:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.30 2013/12/18 20:12:08 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.31 2015/09/10 16:16:35 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -33,7 +33,7 @@ #define RUMP_O_SEARCH 0x0080 /* skip search permission checks */ #define RUMP_O_NOSIGPIPE 0x0100 /* don't deliver sigpipe */ -/* NetBSD: vnode.h,v 1.243 2013/12/01 17:29:40 christos Exp */ +/* NetBSD: vnode.h,v 1.256 2015/07/12 08:11:28 hannken Exp */ enum rump_vtype { RUMP_VNON, RUMP_VREG, RUMP_VDIR, RUMP_VBLK, RUMP_VCHR, RUMP_VLNK, RUMP_VSOCK, RUMP_VFIFO, RUMP_VBAD }; #define RUMP_LK_SHARED 0x0001 #define RUMP_LK_EXCLUSIVE 0x0002 @@ -170,12 +170,14 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_AB_SILENT 0x0004 #define RUMP_AB_DEBUG 0x0008 -/* NetBSD: socket.h,v 1.108 2013/01/31 14:30:47 joerg Exp */ +/* NetBSD: socket.h,v 1.117 2015/04/03 20:01:08 rtr Exp */ #define RUMP_SOCK_STREAM 1 #define RUMP_SOCK_DGRAM 2 #define RUMP_SOCK_RAW 3 #define RUMP_SOCK_RDM 4 #define RUMP_SOCK_SEQPACKET 5 +#define RUMP_SOCK_CONN_DGRAM 6 +#define RUMP_SOCK_DCCP RUMP_SOCK_CONN_DGRAM #define RUMP_SOCK_CLOEXEC 0x1000 #define RUMP_SOCK_NONBLOCK 0x2000 #define RUMP_SOCK_NOSIGPIPE 0x4000 @@ -295,7 +297,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_MSG_IOVUSRSPACE 0x400 #define RUMP_MSG_LENUSRSPACE 0x800 -/* NetBSD: in.h,v 1.89 2013/06/27 19:38:16 christos Exp */ +/* NetBSD: in.h,v 1.97 2015/05/02 14:41:32 roy Exp */ #define RUMP_IP_OPTIONS 1 #define RUMP_IP_HDRINCL 2 #define RUMP_IP_TOS 3 @@ -313,7 +315,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_IP_PORTRANGE 19 #define RUMP_IP_RECVIF 20 #define RUMP_IP_ERRORMTU 21 -#define RUMP_IP_IPSEC_POLICY 22 +#define RUMP_IP_IPSEC_POLICY 22 #define RUMP_IP_RECVTTL 23 #define RUMP_IP_MINTTL 24 #define RUMP_IP_PKTINFO 25 @@ -337,6 +339,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_IPPROTO_UDP 17 #define RUMP_IPPROTO_IDP 22 #define RUMP_IPPROTO_TP 29 +#define RUMP_IPPROTO_DCCP 33 #define RUMP_IPPROTO_IPV6 41 #define RUMP_IPPROTO_ROUTING 43 #define RUMP_IPPROTO_FRAGMENT 44 @@ -362,7 +365,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_IPPROTO_DONE 257 #define RUMP_IPPROTO_MAXID (RUMP_IPPROTO_AH + 1) -/* NetBSD: tcp.h,v 1.30 2012/01/07 20:20:22 christos Exp */ +/* NetBSD: tcp.h,v 1.31 2015/02/14 12:57:53 he Exp */ #define RUMP_TCP_MSS 536 #define RUMP_TCP_MINMSS 216 #define RUMP_TCP_MAXWIN 65535 @@ -376,10 +379,11 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_TCP_KEEPCNT 6 #define RUMP_TCP_KEEPINIT 7 #define RUMP_TCP_NOOPT 8 +#define RUMP_TCP_INFO 9 #define RUMP_TCP_MD5SIG 0x10 #define RUMP_TCP_CONGCTL 0x20 -/* NetBSD: mount.h,v 1.210 2013/11/23 13:35:36 christos Exp */ +/* NetBSD: mount.h,v 1.217 2015/05/06 15:57:08 hannken Exp */ #define RUMP_MOUNT_FFS "ffs" #define RUMP_MOUNT_UFS RUMP_MOUNT_FFS #define RUMP_MOUNT_NFS "nfs" @@ -414,7 +418,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_MOUNT_RUMPFS "rumpfs" #define RUMP_MOUNT_V7FS "v7fs" -/* NetBSD: fstypes.h,v 1.32 2012/11/26 16:22:21 drochner Exp */ +/* NetBSD: fstypes.h,v 1.33 2015/05/06 15:57:08 hannken Exp */ #define RUMP_MNT_RDONLY 0x0001 #define RUMP_MNT_SYNCHRONOUS 0x0002 #define RUMP_MNT_NOEXEC 0x0004 @@ -451,7 +455,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_MNT_NOWAIT 2 #define RUMP_MNT_LAZY 3 -/* NetBSD: ioccom.h,v 1.11 2011/10/19 10:53:12 yamt Exp */ +/* NetBSD: ioccom.h,v 1.12 2014/12/10 00:16:05 christos Exp */ #define RUMP_IOCPARM_MASK 0x1fff #define RUMP_IOCPARM_SHIFT 16 #define RUMP_IOCGROUP_SHIFT 8 @@ -516,7 +520,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_KTRFACv1 (1 << RUMP_KTRFAC_VER_SHIFT) #define RUMP_KTRFACv2 (2 << RUMP_KTRFAC_VER_SHIFT) -/* NetBSD: module.h,v 1.34 2013/10/23 18:57:40 mbalmer Exp */ +/* NetBSD: module.h,v 1.38 2015/06/22 16:35:13 matt Exp */ struct rump_modctl_load { const char *ml_filename; @@ -532,7 +536,7 @@ enum rump_modctl { RUMP_MODCTL_EXISTS /* enum: 0: load, 1: autoload */ };
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Sep 10 16:21:48 UTC 2015 Modified Files: src/sys/rump/include/rump: rumpdefs.h rumperr.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r1.2 -r1.3 src/sys/rump/include/rump/rumperr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Sep 10 16:21:32 UTC 2015 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Fix #define ERRNO EANOTHERRNO. Was: #define RUMP_ERRNO EANOTHERRNO Now: #define RUMP_ERRNO RUMP_EANOTHERRNO pointed out by Sebastian Wicki on irc To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.26 src/sys/rump/include/rump/makerumpdefs.sh:1.27 --- src/sys/rump/include/rump/makerumpdefs.sh:1.26 Thu Sep 10 16:14:22 2015 +++ src/sys/rump/include/rump/makerumpdefs.sh Thu Sep 10 16:21:32 2015 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec 3>&1 > rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.26 2015/09/10 16:14:22 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.27 2015/09/10 16:21:32 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -60,7 +60,8 @@ sed -n '/#define.*LK_[A-Z]/s/LK_/RUMP_LK | sed 's,/\*.*$,,' fromvers ../../../sys/errno.h -sed -n '/#define[ ]*E/s/E[A-Z]*/RUMP_&/p' < ../../../sys/errno.h +sed -n '/#define[ ]*E/s/\([ ]\)\(E[A-Z2][A-Z]*\)/\1RUMP_\2/gp' \ +< ../../../sys/errno.h fromvers ../../../sys/reboot.h sed -n '/#define.*RB_[A-Z]/s/RB_/RUMP_RB_/gp' <../../../sys/reboot.h \ @@ -129,7 +130,7 @@ echo Generating rumperr.h rm -f rumperr.h exec > rumperr.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.26 2015/09/10 16:14:22 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.27 2015/09/10 16:21:32 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' fromvers ../../../sys/errno.h
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Sat Jan 3 17:24:20 UTC 2015 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: limit visibility of sysproxy calls to where they are needed To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/rump/include/rump/rumpuser.h 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/rumpuser.h diff -u src/sys/rump/include/rump/rumpuser.h:1.113 src/sys/rump/include/rump/rumpuser.h:1.114 --- src/sys/rump/include/rump/rumpuser.h:1.113 Wed Jun 18 19:50:32 2014 +++ src/sys/rump/include/rump/rumpuser.h Sat Jan 3 17:24:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser.h,v 1.113 2014/06/18 19:50:32 alnsn Exp $ */ +/* $NetBSD: rumpuser.h,v 1.114 2015/01/03 17:24:20 pooka Exp $ */ /* * Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved. @@ -235,6 +235,7 @@ void rumpuser_dl_bootstrap(rump_modinit_ int rumpuser_daemonize_begin(void); int rumpuser_daemonize_done(int); +#if defined(_RUMP_SYSPROXY) || defined(LIBRUMPUSER) /* * syscall proxy */ @@ -248,5 +249,6 @@ int rumpuser_sp_copyoutstr(void *, const int rumpuser_sp_anonmmap(void *, size_t, void **); int rumpuser_sp_raise(void *, int); void rumpuser_sp_fini(void *); +#endif /* _RUMP_SYSPROXY || LIBRUMPUSER */ #endif /* _RUMP_RUMPUSER_H_ */
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Sat Jan 3 17:24:20 UTC 2015 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: limit visibility of sysproxy calls to where they are needed To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/rump/include/rump/rumpuser.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: alnsn Date: Wed Jun 18 19:50:32 UTC 2014 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: Revert last change. This is not the right place for rumpuser_sync_icache(). To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/rump/include/rump/rumpuser.h 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/rumpuser.h diff -u src/sys/rump/include/rump/rumpuser.h:1.112 src/sys/rump/include/rump/rumpuser.h:1.113 --- src/sys/rump/include/rump/rumpuser.h:1.112 Tue Jun 17 06:31:47 2014 +++ src/sys/rump/include/rump/rumpuser.h Wed Jun 18 19:50:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser.h,v 1.112 2014/06/17 06:31:47 alnsn Exp $ */ +/* $NetBSD: rumpuser.h,v 1.113 2014/06/18 19:50:32 alnsn Exp $ */ /* * Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved. @@ -229,11 +229,6 @@ typedef void (*rump_compload_fn)(const s void rumpuser_dl_bootstrap(rump_modinit_fn, rump_symload_fn, rump_compload_fn); /* - * cache management - */ -int rumpuser_sync_icache(void *addr, uint64_t len); - -/* * misc management */
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: alnsn Date: Wed Jun 18 19:50:32 UTC 2014 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: Revert last change. This is not the right place for rumpuser_sync_icache(). To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/rump/include/rump/rumpuser.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Mon Mar 10 22:48:29 UTC 2014 Modified Files: src/sys/rump/include/rump: rump.h Log Message: add a compat prototype for rump_getversion() To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/rump/include/rump/rump.h 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/rump.h diff -u src/sys/rump/include/rump/rump.h:1.60 src/sys/rump/include/rump/rump.h:1.61 --- src/sys/rump/include/rump/rump.h:1.60 Mon Mar 10 22:44:10 2014 +++ src/sys/rump/include/rump/rump.h Mon Mar 10 22:48:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.60 2014/03/10 22:44:10 pooka Exp $ */ +/* $NetBSD: rump.h,v 1.61 2014/03/10 22:48:29 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -101,6 +101,7 @@ _BEGIN_DECLS #endif int rump_getversion(void); +int rump_pub_getversion(void); /* compat */ int rump_nativeabi_p(void); int rump_boot_gethowto(void);
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Mon Mar 10 22:48:29 UTC 2014 Modified Files: src/sys/rump/include/rump: rump.h Log Message: add a compat prototype for rump_getversion() To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/rump/include/rump/rump.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Dec 18 20:10:58 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: generate errno - str routine (for portable programs) To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.24 src/sys/rump/include/rump/makerumpdefs.sh:1.25 --- src/sys/rump/include/rump/makerumpdefs.sh:1.24 Wed Dec 11 23:13:48 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Wed Dec 18 20:10:58 2013 @@ -6,9 +6,9 @@ echo Generating rumpdefs.h rm -f rumpdefs.h -exec rumpdefs.h +exec 31 rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.24 2013/12/11 23:13:48 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.25 2013/12/18 20:10:58 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -123,3 +123,48 @@ fromvers ../../../sys/dirent.h getstruct ../../../sys/dirent.h dirent printf '\n#endif /* _RUMP_RUMPDEFS_H_ */\n' + +exec 13 +echo Generating rumperr.h +rm -f rumperr.h +exec rumperr.h + +printf '/* $NetBSD: makerumpdefs.sh,v 1.25 2013/12/18 20:10:58 pooka Exp $ */\n\n' +printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' + +fromvers ../../../sys/errno.h + +printf \nstatic inline const char *\nrump_strerror(int error)\n{\n\n +printf \tswitch (error) {\n\tcase 0:\n +printf \t\t return \No error: zero, zip, zilch, none!\;\n +awk '/^#define[ ]*E.*[0-9]/{ + ename = $2 + evalue = $3 + error = 1 + if (ename == ELAST) { + printf \tdefault:\n + printf \t\treturn \Invalid error!\;\n\t}\n}\n + error = 0 + exit 0 + } + if (preverror + 1 != evalue) + exit 1 + preverror = evalue + printf \tcase %d: /* (%s) */\n\t\treturn \, evalue, ename + sp = + for (i = 5; i NF; i++) { + printf %s%s, sp, $i + sp = + } + printf \;\n +} +END { + exit error +}' ../../../sys/errno.h +if [ $? -ne 0 ]; then + echo 'Parsing errno.h failed!' 13 + rm -f rumpdefs.h rumperr.h + exit 1 +fi + +exit 0
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Dec 18 20:12:08 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Added Files: src/sys/rump/include/rump: rumperr.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r0 -r1.1 src/sys/rump/include/rump/rumperr.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.29 src/sys/rump/include/rump/rumpdefs.h:1.30 --- src/sys/rump/include/rump/rumpdefs.h:1.29 Wed Dec 11 23:14:03 2013 +++ src/sys/rump/include/rump/rumpdefs.h Wed Dec 18 20:12:08 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.29 2013/12/11 23:14:03 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.30 2013/12/18 20:12:08 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. Added files: Index: src/sys/rump/include/rump/rumperr.h diff -u /dev/null src/sys/rump/include/rump/rumperr.h:1.1 --- /dev/null Wed Dec 18 20:12:08 2013 +++ src/sys/rump/include/rump/rumperr.h Wed Dec 18 20:12:08 2013 @@ -0,0 +1,211 @@ +/* $NetBSD: rumperr.h,v 1.1 2013/12/18 20:12:08 pooka Exp $ */ + +/* + * AUTOMATICALLY GENERATED. DO NOT EDIT. + */ + +/* NetBSD: errno.h,v 1.40 2013/01/02 18:51:53 dsl Exp */ + +static inline const char * +rump_strerror(int error) +{ + + switch (error) { + case 0: + return No error: zero, zip, zilch, none!; + case 1: /* (EPERM) */ + return Operation not permitted; + case 2: /* (ENOENT) */ + return No such file or directory; + case 3: /* (ESRCH) */ + return No such process; + case 4: /* (EINTR) */ + return Interrupted system call; + case 5: /* (EIO) */ + return Input/output error; + case 6: /* (ENXIO) */ + return Device not configured; + case 7: /* (E2BIG) */ + return Argument list too long; + case 8: /* (ENOEXEC) */ + return Exec format error; + case 9: /* (EBADF) */ + return Bad file descriptor; + case 10: /* (ECHILD) */ + return No child processes; + case 11: /* (EDEADLK) */ + return Resource deadlock avoided; + case 12: /* (ENOMEM) */ + return Cannot allocate memory; + case 13: /* (EACCES) */ + return Permission denied; + case 14: /* (EFAULT) */ + return Bad address; + case 15: /* (ENOTBLK) */ + return Block device required; + case 16: /* (EBUSY) */ + return Device busy; + case 17: /* (EEXIST) */ + return File exists; + case 18: /* (EXDEV) */ + return Cross-device link; + case 19: /* (ENODEV) */ + return Operation not supported by device; + case 20: /* (ENOTDIR) */ + return Not a directory; + case 21: /* (EISDIR) */ + return Is a directory; + case 22: /* (EINVAL) */ + return Invalid argument; + case 23: /* (ENFILE) */ + return Too many open files in system; + case 24: /* (EMFILE) */ + return Too many open files; + case 25: /* (ENOTTY) */ + return Inappropriate ioctl for device; + case 26: /* (ETXTBSY) */ + return Text file busy; + case 27: /* (EFBIG) */ + return File too large; + case 28: /* (ENOSPC) */ + return No space left on device; + case 29: /* (ESPIPE) */ + return Illegal seek; + case 30: /* (EROFS) */ + return Read-only file system; + case 31: /* (EMLINK) */ + return Too many links; + case 32: /* (EPIPE) */ + return Broken pipe; + case 33: /* (EDOM) */ + return Numerical argument out of domain; + case 34: /* (ERANGE) */ + return Result too large or too small; + case 35: /* (EAGAIN) */ + return Resource temporarily unavailable; + case 36: /* (EINPROGRESS) */ + return Operation now in progress; + case 37: /* (EALREADY) */ + return Operation already in progress; + case 38: /* (ENOTSOCK) */ + return Socket operation on non-socket; + case 39: /* (EDESTADDRREQ) */ + return Destination address required; + case 40: /* (EMSGSIZE) */ + return Message too long; + case 41: /* (EPROTOTYPE) */ + return Protocol wrong type for socket; + case 42: /* (ENOPROTOOPT) */ + return Protocol option not available; + case 43: /* (EPROTONOSUPPORT) */ + return Protocol not supported; + case 44: /* (ESOCKTNOSUPPORT) */ + return Socket type not supported; + case 45: /* (EOPNOTSUPP) */ + return Operation not supported; + case 46: /* (EPFNOSUPPORT) */ + return Protocol family not supported; + case 47: /* (EAFNOSUPPORT) */ + return Address family not supported by protocol family; + case 48: /* (EADDRINUSE) */ + return Address already in use; + case 49: /* (EADDRNOTAVAIL) */ + return Can't assign requested address; + case 50: /* (ENETDOWN) */ + return Network is down; + case 51: /* (ENETUNREACH) */ + return Network is unreachable; + case 52: /* (ENETRESET) */ + return Network dropped connection on reset; + case 53: /* (ECONNABORTED) */ + return Software caused connection abort; + case 54: /* (ECONNRESET) */ + return Connection reset by peer; + case 55: /* (ENOBUFS) */ + return No buffer space available; + case 56: /* (EISCONN) */ + return Socket is already
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Dec 18 20:10:58 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: generate errno - str routine (for portable programs) To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Dec 18 20:12:08 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Added Files: src/sys/rump/include/rump: rumperr.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/rump/include/rump/rumpdefs.h cvs rdiff -u -r0 -r1.1 src/sys/rump/include/rump/rumperr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Dec 11 23:14:03 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.28 src/sys/rump/include/rump/rumpdefs.h:1.29 --- src/sys/rump/include/rump/rumpdefs.h:1.28 Mon Dec 9 19:31:36 2013 +++ src/sys/rump/include/rump/rumpdefs.h Wed Dec 11 23:14:03 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.28 2013/12/09 19:31:36 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.29 2013/12/11 23:14:03 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -512,6 +512,9 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_KTRFAC_VER_MASK 0x0f00 #define RUMP_KTRFAC_VER_SHIFT 24 #define RUMP_KTRFAC_VERSION(tf) (((tf) RUMP_KTRFAC_VER_MASK) RUMP_KTRFAC_VER_SHIFT) +#define RUMP_KTRFACv0 (0 RUMP_KTRFAC_VER_SHIFT) +#define RUMP_KTRFACv1 (1 RUMP_KTRFAC_VER_SHIFT) +#define RUMP_KTRFACv2 (2 RUMP_KTRFAC_VER_SHIFT) /* NetBSD: module.h,v 1.34 2013/10/23 18:57:40 mbalmer Exp */ struct rump_modctl_load {
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Dec 11 23:13:49 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: need to grab KTRFACv[n] too To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.23 src/sys/rump/include/rump/makerumpdefs.sh:1.24 --- src/sys/rump/include/rump/makerumpdefs.sh:1.23 Mon Dec 9 19:31:00 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Wed Dec 11 23:13:48 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.23 2013/12/09 19:31:00 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.24 2013/12/11 23:13:48 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -107,6 +107,7 @@ fromvers ../../../sys/ktrace.h sed -n '/#define[ ]*KTROP_[A-Z_]/s/KTROP_/RUMP_/gp' ../../../sys/ktrace.h | sed 's,/\*.*$,,' sed -n '/#define[ ]*KTR_[A-Z_]/s/KTR_/RUMP_/gp' ../../../sys/ktrace.h | sed 's,/\*.*$,,' sed -n '/#define[ ]*KTRFAC_[A-Z_]/{s/KTRFAC_/RUMP_/g;s/KTR_/RUMP_/g;p;}' ../../../sys/ktrace.h | sed 's,/\*.*$,,' +sed -n '/#define[ ]*KTRFACv[0-9]/{s/KTRFACv/RUMP_/g;s/KTRFAC_/RUMP_/g;p;}' ../../../sys/ktrace.h | sed 's,/\*.*$,,' fromvers ../../../sys/module.h getstruct ../../../sys/module.h modctl_load
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Dec 11 23:14:03 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Dec 11 23:13:49 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: need to grab KTRFACv[n] too To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Mon Dec 9 19:31:00 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: include ktrace constants To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.22 src/sys/rump/include/rump/makerumpdefs.sh:1.23 --- src/sys/rump/include/rump/makerumpdefs.sh:1.22 Wed Nov 13 16:42:00 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Mon Dec 9 19:31:00 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.22 2013/11/13 16:42:00 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.23 2013/12/09 19:31:00 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -103,6 +103,11 @@ sed -n '/#define[ ]*_IO.*\\$/{:t;N;/\\$ sed -n '/#define[ ]*_IO.*[^\]$/{s/_IO/_RUMP_IO/g;s/IOC_/RUMP_IOC_/gp}' ../../../sys/ioccom.h \ | sed 's,/\*.*$,,' +fromvers ../../../sys/ktrace.h +sed -n '/#define[ ]*KTROP_[A-Z_]/s/KTROP_/RUMP_/gp' ../../../sys/ktrace.h | sed 's,/\*.*$,,' +sed -n '/#define[ ]*KTR_[A-Z_]/s/KTR_/RUMP_/gp' ../../../sys/ktrace.h | sed 's,/\*.*$,,' +sed -n '/#define[ ]*KTRFAC_[A-Z_]/{s/KTRFAC_/RUMP_/g;s/KTR_/RUMP_/g;p;}' ../../../sys/ktrace.h | sed 's,/\*.*$,,' + fromvers ../../../sys/module.h getstruct ../../../sys/module.h modctl_load getenum ../../../sys/module.h modctl MODCTL
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Mon Dec 9 19:31:36 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.27 src/sys/rump/include/rump/rumpdefs.h:1.28 --- src/sys/rump/include/rump/rumpdefs.h:1.27 Wed Nov 13 16:42:30 2013 +++ src/sys/rump/include/rump/rumpdefs.h Mon Dec 9 19:31:36 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.27 2013/11/13 16:42:30 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.28 2013/12/09 19:31:36 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -33,7 +33,7 @@ #define RUMP_O_SEARCH 0x0080 /* skip search permission checks */ #define RUMP_O_NOSIGPIPE 0x0100 /* don't deliver sigpipe */ -/* NetBSD: vnode.h,v 1.240 2013/11/07 09:48:34 hannken Exp */ +/* NetBSD: vnode.h,v 1.243 2013/12/01 17:29:40 christos Exp */ enum rump_vtype { RUMP_VNON, RUMP_VREG, RUMP_VDIR, RUMP_VBLK, RUMP_VCHR, RUMP_VLNK, RUMP_VSOCK, RUMP_VFIFO, RUMP_VBAD }; #define RUMP_LK_SHARED 0x0001 #define RUMP_LK_EXCLUSIVE 0x0002 @@ -295,7 +295,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_MSG_IOVUSRSPACE 0x400 #define RUMP_MSG_LENUSRSPACE 0x800 -/* NetBSD: in.h,v 1.87 2012/06/22 14:54:35 christos Exp */ +/* NetBSD: in.h,v 1.89 2013/06/27 19:38:16 christos Exp */ #define RUMP_IP_OPTIONS 1 #define RUMP_IP_HDRINCL 2 #define RUMP_IP_TOS 3 @@ -316,6 +316,8 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_IP_IPSEC_POLICY 22 #define RUMP_IP_RECVTTL 23 #define RUMP_IP_MINTTL 24 +#define RUMP_IP_PKTINFO 25 +#define RUMP_IP_RECVPKTINFO 26 #define RUMP_IP_DEFAULT_MULTICAST_TTL 1 #define RUMP_IP_DEFAULT_MULTICAST_LOOP 1 #define RUMP_IP_MAX_MEMBERSHIPS 20 @@ -377,7 +379,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_TCP_MD5SIG 0x10 #define RUMP_TCP_CONGCTL 0x20 -/* NetBSD: mount.h,v 1.209 2013/04/26 22:27:16 mlelstv Exp */ +/* NetBSD: mount.h,v 1.210 2013/11/23 13:35:36 christos Exp */ #define RUMP_MOUNT_FFS ffs #define RUMP_MOUNT_UFS RUMP_MOUNT_FFS #define RUMP_MOUNT_NFS nfs @@ -470,6 +472,47 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define _RUMP_IOW(g,n,t) _RUMP_IOC(RUMP_IOC_IN, (g), (n), sizeof(t)) #define _RUMP_IOWR(g,n,t) _RUMP_IOC(RUMP_IOC_INOUT, (g), (n), sizeof(t)) +/* NetBSD: ktrace.h,v 1.61 2013/12/09 17:43:58 pooka Exp */ +#define RUMP_KTROP_SET 0 +#define RUMP_KTROP_CLEAR 1 +#define RUMP_KTROP_CLEARFILE 2 +#define RUMP_KTROP_MASK 0x3 +#define RUMP_KTR_SHIMLEN offsetof(struct ktr_header, ktr_pid) +#define RUMP_KTR_SYSCALL 1 +#define RUMP_KTR_SYSRET 2 +#define RUMP_KTR_NAMEI 3 +#define RUMP_KTR_GENIO 4 +#define RUMP_KTR_PSIG 5 +#define RUMP_KTR_CSW 6 +#define RUMP_KTR_EMUL 7 +#define RUMP_KTR_USER 8 +#define RUMP_KTR_USER_MAXIDLEN 20 +#define RUMP_KTR_USER_MAXLEN 2048 +#define RUMP_KTR_EXEC_ARG 10 +#define RUMP_KTR_EXEC_ENV 11 +#define RUMP_KTR_SAUPCALL 13 +#define RUMP_KTR_MIB 14 +#define RUMP_KTR_EXEC_FD 15 +#define RUMP_KTRFAC_MASK 0x00ff +#define RUMP_KTRFAC_SYSCALL (1RUMP_KTR_SYSCALL) +#define RUMP_KTRFAC_SYSRET (1RUMP_KTR_SYSRET) +#define RUMP_KTRFAC_NAMEI (1RUMP_KTR_NAMEI) +#define RUMP_KTRFAC_GENIO (1RUMP_KTR_GENIO) +#define RUMP_KTRFAC_PSIG (1RUMP_KTR_PSIG) +#define RUMP_KTRFAC_CSW (1RUMP_KTR_CSW) +#define RUMP_KTRFAC_EMUL (1RUMP_KTR_EMUL) +#define RUMP_KTRFAC_USER (1RUMP_KTR_USER) +#define RUMP_KTRFAC_EXEC_ARG (1RUMP_KTR_EXEC_ARG) +#define RUMP_KTRFAC_EXEC_ENV (1RUMP_KTR_EXEC_ENV) +#define RUMP_KTRFAC_MIB (1RUMP_KTR_MIB) +#define RUMP_KTRFAC_EXEC_FD (1RUMP_KTR_EXEC_FD) +#define RUMP_KTRFAC_PERSISTENT 0x8000 +#define RUMP_KTRFAC_INHERIT 0x4000 +#define RUMP_KTRFAC_TRC_EMUL 0x1000 +#define RUMP_KTRFAC_VER_MASK 0x0f00 +#define RUMP_KTRFAC_VER_SHIFT 24 +#define RUMP_KTRFAC_VERSION(tf) (((tf) RUMP_KTRFAC_VER_MASK) RUMP_KTRFAC_VER_SHIFT) + /* NetBSD: module.h,v 1.34 2013/10/23 18:57:40 mbalmer Exp */ struct rump_modctl_load { const char *ml_filename; @@ -486,7 +529,7 @@ enum rump_modctl { RUMP_MODCTL_EXISTS /* enum: 0: load, 1: autoload */ }; -/* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */ +/* NetBSD: ufsmount.h,v 1.41 2013/08/11 04:36:17 dholland Exp */ struct rump_ufs_args { char *fspec; /* block special device to mount */ };
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Mon Dec 9 19:31:00 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: include ktrace constants To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Mon Dec 9 19:31:36 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Nov 13 16:42:00 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: do enums, grab enum modctl To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.21 src/sys/rump/include/rump/makerumpdefs.sh:1.22 --- src/sys/rump/include/rump/makerumpdefs.sh:1.21 Thu Aug 15 22:10:04 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Wed Nov 13 16:42:00 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.21 2013/08/15 22:10:04 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.22 2013/11/13 16:42:00 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -34,6 +34,22 @@ struct rump_'$2' { }' $1 } +# likewise not perfect, but as long as it's KNF, we're peachy (though +# I personally like nectarines more) +getenum () { + sed -n '/enum[ ]*'$2'[ ]*{/{ + a\ +enum rump_'$2' { + :loop + n + s/^}.*;$/};/p + t + s/'$3'/RUMP_/gp + b loop + }' $1 +} + + fromvers ../../../sys/fcntl.h sed -n '/#define O_[A-Z]* *0x/s/O_/RUMP_O_/gp' \ ../../../sys/fcntl.h @@ -89,6 +105,7 @@ sed -n '/#define[ ]*_IO.*[^\]$/{s/_IO/_ fromvers ../../../sys/module.h getstruct ../../../sys/module.h modctl_load +getenum ../../../sys/module.h modctl MODCTL fromvers ../../../ufs/ufs/ufsmount.h getstruct ../../../ufs/ufs/ufsmount.h ufs_args
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Nov 13 16:42:30 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.26 src/sys/rump/include/rump/rumpdefs.h:1.27 --- src/sys/rump/include/rump/rumpdefs.h:1.26 Thu Aug 15 22:10:22 2013 +++ src/sys/rump/include/rump/rumpdefs.h Wed Nov 13 16:42:30 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.26 2013/08/15 22:10:22 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.27 2013/11/13 16:42:30 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -9,7 +9,7 @@ #include rump/rump_namei.h -/* NetBSD: fcntl.h,v 1.45 2013/01/13 08:15:03 dholland Exp */ +/* NetBSD: fcntl.h,v 1.46 2013/09/15 10:41:20 njoly Exp */ #define RUMP_O_RDONLY 0x /* open for reading only */ #define RUMP_O_WRONLY 0x0001 /* open for writing only */ #define RUMP_O_RDWR 0x0002 /* open for reading and writing */ @@ -33,7 +33,7 @@ #define RUMP_O_SEARCH 0x0080 /* skip search permission checks */ #define RUMP_O_NOSIGPIPE 0x0100 /* don't deliver sigpipe */ -/* NetBSD: vnode.h,v 1.237 2012/11/18 18:39:24 pooka Exp */ +/* NetBSD: vnode.h,v 1.240 2013/11/07 09:48:34 hannken Exp */ enum rump_vtype { RUMP_VNON, RUMP_VREG, RUMP_VDIR, RUMP_VBLK, RUMP_VCHR, RUMP_VLNK, RUMP_VSOCK, RUMP_VFIFO, RUMP_VBAD }; #define RUMP_LK_SHARED 0x0001 #define RUMP_LK_EXCLUSIVE 0x0002 @@ -470,7 +470,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define _RUMP_IOW(g,n,t) _RUMP_IOC(RUMP_IOC_IN, (g), (n), sizeof(t)) #define _RUMP_IOWR(g,n,t) _RUMP_IOC(RUMP_IOC_INOUT, (g), (n), sizeof(t)) -/* NetBSD: module.h,v 1.32 2012/10/17 17:48:48 dyoung Exp */ +/* NetBSD: module.h,v 1.34 2013/10/23 18:57:40 mbalmer Exp */ struct rump_modctl_load { const char *ml_filename; @@ -479,6 +479,12 @@ struct rump_modctl_load { const char *ml_props; size_t ml_propslen; }; +enum rump_modctl { + RUMP_MODCTL_LOAD, /* modctl_load_t *ml */ + RUMP_MODCTL_UNLOAD, /* char *name */ + RUMP_MODCTL_STAT, /* struct iovec *buffer */ + RUMP_MODCTL_EXISTS /* enum: 0: load, 1: autoload */ +}; /* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */ struct rump_ufs_args {
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Nov 13 16:42:00 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: do enums, grab enum modctl To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 20:45:12 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: grab struct dirent To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.18 src/sys/rump/include/rump/makerumpdefs.sh:1.19 --- src/sys/rump/include/rump/makerumpdefs.sh:1.18 Tue Jun 25 21:06:39 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Thu Aug 15 20:45:12 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.18 2013/06/25 21:06:39 stacktic Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.19 2013/08/15 20:45:12 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -95,4 +95,7 @@ getstruct ../../../ufs/ufs/ufsmount.h uf fromvers ../../../fs/sysvbfs/sysvbfs_args.h getstruct ../../../fs/sysvbfs/sysvbfs_args.h sysvbfs_args +fromvers ../../../sys/dirent.h +getstruct ../../../sys/dirent.h dirent + printf '\n#endif /* _RUMP_RUMPDEFS_H_ */\n'
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 20:45:38 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.22 src/sys/rump/include/rump/rumpdefs.h:1.23 --- src/sys/rump/include/rump/rumpdefs.h:1.22 Tue Jun 25 21:07:22 2013 +++ src/sys/rump/include/rump/rumpdefs.h Thu Aug 15 20:45:38 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.22 2013/06/25 21:07:22 stacktic Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.23 2013/08/15 20:45:38 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -295,7 +295,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_MSG_IOVUSRSPACE 0x400 #define RUMP_MSG_LENUSRSPACE 0x800 -/* NetBSD: in.h,v 1.88 2013/04/27 21:35:24 joerg Exp */ +/* NetBSD: in.h,v 1.87 2012/06/22 14:54:35 christos Exp */ #define RUMP_IP_OPTIONS 1 #define RUMP_IP_HDRINCL 2 #define RUMP_IP_TOS 3 @@ -480,7 +480,7 @@ struct rump_modctl_load { size_t ml_propslen; }; -/* NetBSD: ufsmount.h,v 1.40 2013/06/16 13:33:30 hannken Exp */ +/* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */ struct rump_ufs_args { char *fspec; /* block special device to mount */ }; @@ -490,4 +490,17 @@ struct rump_sysvbfs_args { char *fspec; /* blocks special holding the fs to mount */ }; +/* NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp */ +struct rump_dirent { + ino_t d_fileno; /* file number of entry */ + uint16_t d_reclen; /* length of this record */ + uint16_t d_namlen; /* length of string in d_name */ + uint8_t d_type; /* file type, see below */ +#if defined(_NETBSD_SOURCE) + char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */ +#else + char d_name[511 + 1]; /* name must be no longer than this */ +#endif +}; + #endif /* _RUMP_RUMPDEFS_H_ */
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:00:56 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: revert pending fix: MAXNAMLEN causes trouble To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.23 src/sys/rump/include/rump/rumpdefs.h:1.24 --- src/sys/rump/include/rump/rumpdefs.h:1.23 Thu Aug 15 20:45:38 2013 +++ src/sys/rump/include/rump/rumpdefs.h Thu Aug 15 21:00:56 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.23 2013/08/15 20:45:38 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.24 2013/08/15 21:00:56 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -295,7 +295,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_MSG_IOVUSRSPACE 0x400 #define RUMP_MSG_LENUSRSPACE 0x800 -/* NetBSD: in.h,v 1.87 2012/06/22 14:54:35 christos Exp */ +/* NetBSD: in.h,v 1.88 2013/04/27 21:35:24 joerg Exp */ #define RUMP_IP_OPTIONS 1 #define RUMP_IP_HDRINCL 2 #define RUMP_IP_TOS 3 @@ -480,7 +480,7 @@ struct rump_modctl_load { size_t ml_propslen; }; -/* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */ +/* NetBSD: ufsmount.h,v 1.40 2013/06/16 13:33:30 hannken Exp */ struct rump_ufs_args { char *fspec; /* block special device to mount */ }; @@ -490,17 +490,4 @@ struct rump_sysvbfs_args { char *fspec; /* blocks special holding the fs to mount */ }; -/* NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp */ -struct rump_dirent { - ino_t d_fileno; /* file number of entry */ - uint16_t d_reclen; /* length of this record */ - uint16_t d_namlen; /* length of string in d_name */ - uint8_t d_type; /* file type, see below */ -#if defined(_NETBSD_SOURCE) - char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */ -#else - char d_name[511 + 1]; /* name must be no longer than this */ -#endif -}; - #endif /* _RUMP_RUMPDEFS_H_ */
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:21:47 UTC 2013 Modified Files: src/sys/rump/include/rump: rump_syscalls_compat.h Log Message: Give includers a way to say yea I'll just deal with the type compat on my own, thank you very many To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/rump/include/rump/rump_syscalls_compat.h 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/rump_syscalls_compat.h diff -u src/sys/rump/include/rump/rump_syscalls_compat.h:1.11 src/sys/rump/include/rump/rump_syscalls_compat.h:1.12 --- src/sys/rump/include/rump/rump_syscalls_compat.h:1.11 Thu Aug 15 21:16:12 2013 +++ src/sys/rump/include/rump/rump_syscalls_compat.h Thu Aug 15 21:21:47 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls_compat.h,v 1.11 2013/08/15 21:16:12 pooka Exp $ */ +/* $NetBSD: rump_syscalls_compat.h,v 1.12 2013/08/15 21:21:47 pooka Exp $ */ /*- * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -28,11 +28,14 @@ #ifndef _RUMP_RUMP_SYSCALLS_COMPAT_H_ #define _RUMP_RUMP_SYSCALLS_COMPAT_H_ +/* should have a smaller hammer here */ +#ifndef RUMP_HOST_NOT_POSIX #include sys/types.h /* typedefs */ #include sys/select.h /* typedefs */ #include sys/socket.h /* typedefs */ #include signal.h /* typedefs */ +#endif #ifdef __NetBSD__ #include sys/cdefs.h
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:29:04 UTC 2013 Modified Files: src/sys/rump/include/rump: rump_syscalls_compat.h Log Message: Explicitly produce an error if the mythical kernel folk try to include this header. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/rump/include/rump/rump_syscalls_compat.h 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/rump_syscalls_compat.h diff -u src/sys/rump/include/rump/rump_syscalls_compat.h:1.12 src/sys/rump/include/rump/rump_syscalls_compat.h:1.13 --- src/sys/rump/include/rump/rump_syscalls_compat.h:1.12 Thu Aug 15 21:21:47 2013 +++ src/sys/rump/include/rump/rump_syscalls_compat.h Thu Aug 15 21:29:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls_compat.h,v 1.12 2013/08/15 21:21:47 pooka Exp $ */ +/* $NetBSD: rump_syscalls_compat.h,v 1.13 2013/08/15 21:29:04 pooka Exp $ */ /*- * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -25,6 +25,10 @@ * SUCH DAMAGE. */ +#ifdef _KERNEL +#error rump_syscalls_compat is not for kernel consumers +#endif + #ifndef _RUMP_RUMP_SYSCALLS_COMPAT_H_ #define _RUMP_RUMP_SYSCALLS_COMPAT_H_
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:48:05 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.24 src/sys/rump/include/rump/rumpdefs.h:1.25 --- src/sys/rump/include/rump/rumpdefs.h:1.24 Thu Aug 15 21:00:56 2013 +++ src/sys/rump/include/rump/rumpdefs.h Thu Aug 15 21:48:05 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.24 2013/08/15 21:00:56 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.25 2013/08/15 21:48:05 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -295,7 +295,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_MSG_IOVUSRSPACE 0x400 #define RUMP_MSG_LENUSRSPACE 0x800 -/* NetBSD: in.h,v 1.88 2013/04/27 21:35:24 joerg Exp */ +/* NetBSD: in.h,v 1.87 2012/06/22 14:54:35 christos Exp */ #define RUMP_IP_OPTIONS 1 #define RUMP_IP_HDRINCL 2 #define RUMP_IP_TOS 3 @@ -480,7 +480,7 @@ struct rump_modctl_load { size_t ml_propslen; }; -/* NetBSD: ufsmount.h,v 1.40 2013/06/16 13:33:30 hannken Exp */ +/* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */ struct rump_ufs_args { char *fspec; /* block special device to mount */ }; @@ -490,4 +490,13 @@ struct rump_sysvbfs_args { char *fspec; /* blocks special holding the fs to mount */ }; +/* NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp */ +struct rump_dirent { + ino_t d_fileno; /* file number of entry */ + uint16_t d_reclen; /* length of this record */ + uint16_t d_namlen; /* length of string in d_name */ + uint8_t d_type; /* file type, see below */ + char d_name[511 + 1]; /* name must be no longer than this */ +}; + #endif /* _RUMP_RUMPDEFS_H_ */
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:47:46 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Explicitly avoid MAXNAMELEN. I'm not claiming it's pretty, but most likely it's more bang for the buck than adding cpp support to the sed script. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.19 src/sys/rump/include/rump/makerumpdefs.sh:1.20 --- src/sys/rump/include/rump/makerumpdefs.sh:1.19 Thu Aug 15 20:45:12 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Thu Aug 15 21:47:46 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.19 2013/08/15 20:45:12 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.20 2013/08/15 21:47:46 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -20,6 +20,7 @@ fromvers () { } # not perfect, but works well enough for the cases so far +# (also has one struct-specific hack for MAXNAMLEN) getstruct () { sed -n '/struct[ ]*'$2'[ ]*{/{ a\ @@ -28,7 +29,7 @@ struct rump_'$2' { n s/^}.*;$/};/p t - /#define/!p + /^#/!{/MAXNAMLEN/!p} b loop }' $1 }
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 22:10:05 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: translate ino_t to a portability-friendlier type To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.20 src/sys/rump/include/rump/makerumpdefs.sh:1.21 --- src/sys/rump/include/rump/makerumpdefs.sh:1.20 Thu Aug 15 21:47:46 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Thu Aug 15 22:10:04 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.20 2013/08/15 21:47:46 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.21 2013/08/15 22:10:04 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -29,7 +29,7 @@ struct rump_'$2' { n s/^}.*;$/};/p t - /^#/!{/MAXNAMLEN/!p} + /^#/!{/MAXNAMLEN/!{s/ino_t/uint64_t/;p;}} b loop }' $1 }
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 22:10:22 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.25 src/sys/rump/include/rump/rumpdefs.h:1.26 --- src/sys/rump/include/rump/rumpdefs.h:1.25 Thu Aug 15 21:48:05 2013 +++ src/sys/rump/include/rump/rumpdefs.h Thu Aug 15 22:10:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.25 2013/08/15 21:48:05 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.26 2013/08/15 22:10:22 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -492,7 +492,7 @@ struct rump_sysvbfs_args { /* NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp */ struct rump_dirent { - ino_t d_fileno; /* file number of entry */ + uint64_t d_fileno; /* file number of entry */ uint16_t d_reclen; /* length of this record */ uint16_t d_namlen; /* length of string in d_name */ uint8_t d_type; /* file type, see below */
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 20:45:12 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: grab struct dirent To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 20:45:38 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:00:56 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: revert pending fix: MAXNAMLEN causes trouble To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:21:47 UTC 2013 Modified Files: src/sys/rump/include/rump: rump_syscalls_compat.h Log Message: Give includers a way to say yea I'll just deal with the type compat on my own, thank you very many To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/rump/include/rump/rump_syscalls_compat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:29:04 UTC 2013 Modified Files: src/sys/rump/include/rump: rump_syscalls_compat.h Log Message: Explicitly produce an error if the mythical kernel folk try to include this header. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/rump/include/rump/rump_syscalls_compat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:47:46 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Explicitly avoid MAXNAMELEN. I'm not claiming it's pretty, but most likely it's more bang for the buck than adding cpp support to the sed script. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:48:05 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 22:10:05 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: translate ino_t to a portability-friendlier type To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 22:10:22 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Jul 16 20:17:06 UTC 2013 Modified Files: src/sys/rump/include/rump: rump.h Log Message: Give reader-friendly aliases to rfork flags. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/rump/include/rump/rump.h 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/rump.h diff -u src/sys/rump/include/rump/rump.h:1.56 src/sys/rump/include/rump/rump.h:1.57 --- src/sys/rump/include/rump/rump.h:1.56 Sat Apr 27 15:13:11 2013 +++ src/sys/rump/include/rump/rump.h Tue Jul 16 20:17:06 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.56 2013/04/27 15:13:11 pooka Exp $ */ +/* $NetBSD: rump.h,v 1.57 2013/07/16 20:17:06 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -79,6 +79,10 @@ enum rump_sigmodel { /* flags to rump_lwproc_rfork */ #define RUMP_RFFDG 0x01 #define RUMP_RFCFDG 0x02 +/* slightly-easier-to-parse aliases for the above */ +#define RUMP_RFFD_SHARE 0x00 /* lossage */ +#define RUMP_RFFD_COPY RUMP_RFFDG +#define RUMP_RFFD_CLEAR RUMP_RFCFDG /* rumpvfs */ #define RUMPCN_FREECRED 0x02
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Tue Jul 16 20:17:06 UTC 2013 Modified Files: src/sys/rump/include/rump: rump.h Log Message: Give reader-friendly aliases to rfork flags. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/rump/include/rump/rump.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: stacktic Date: Tue Jun 25 21:06:39 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: grab ioctl-related macros To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.17 src/sys/rump/include/rump/makerumpdefs.sh:1.18 --- src/sys/rump/include/rump/makerumpdefs.sh:1.17 Sat Jun 1 09:49:37 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Tue Jun 25 21:06:39 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.17 2013/06/01 09:49:37 stacktic Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.18 2013/06/25 21:06:39 stacktic Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -79,6 +79,13 @@ sed -n '/#define[ ]*MOUNT_[A-Z]/s/MOUNT fromvers ../../../sys/fstypes.h sed -n '/#define[ ]*MNT_[A-Z].*[^\]$/s/MNT_/RUMP_MNT_/gp' ../../../sys/fstypes.h | sed 's,/\*.*$,,' +fromvers ../../../sys/ioccom.h +sed -n '/#define[ ]*IOC[A-Z_]/s/IOC/RUMP_/gp' ../../../sys/ioccom.h | sed 's,/\*.*$,,' +sed -n '/#define[ ]*_IO.*\\$/{:t;N;/\\$/bt;s/_IOC/_RUMP_IOC/g;s/IOC[A-Z]/RUMP_/gp}' ../../../sys/ioccom.h \ +| sed 's,/\*.*$,,' +sed -n '/#define[ ]*_IO.*[^\]$/{s/_IO/_RUMP_IO/g;s/IOC_/RUMP_IOC_/gp}' ../../../sys/ioccom.h \ +| sed 's,/\*.*$,,' + fromvers ../../../sys/module.h getstruct ../../../sys/module.h modctl_load
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: stacktic Date: Tue Jun 25 21:07:22 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.21 src/sys/rump/include/rump/rumpdefs.h:1.22 --- src/sys/rump/include/rump/rumpdefs.h:1.21 Sat Jun 1 09:50:32 2013 +++ src/sys/rump/include/rump/rumpdefs.h Tue Jun 25 21:07:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.21 2013/06/01 09:50:32 stacktic Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.22 2013/06/25 21:07:22 stacktic Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -449,6 +449,27 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_MNT_NOWAIT 2 #define RUMP_MNT_LAZY 3 +/* NetBSD: ioccom.h,v 1.11 2011/10/19 10:53:12 yamt Exp */ +#define RUMP_IOCPARM_MASK 0x1fff +#define RUMP_IOCPARM_SHIFT 16 +#define RUMP_IOCGROUP_SHIFT 8 +#define RUMP_IOCPARM_LEN(x) (((x) RUMP_IOCPARM_SHIFT) RUMP_IOCPARM_MASK) +#define RUMP_IOCBASECMD(x) ((x) ~(RUMP_IOCPARM_MASK RUMP_IOCPARM_SHIFT)) +#define RUMP_IOCGROUP(x) (((x) RUMP_IOCGROUP_SHIFT) 0xff) +#define RUMP_IOCPARM_MAX NBPG +#define RUMP_IOC_VOID (unsigned long)0x2000 +#define RUMP_IOC_OUT (unsigned long)0x4000 +#define RUMP_IOC_IN (unsigned long)0x8000 +#define RUMP_IOC_INOUT (RUMP_IOC_IN|RUMP_IOC_OUT) +#define RUMP_IOC_DIRMASK (unsigned long)0xe000 +#define _RUMP_IOC(inout, group, num, len) \ +((inout) | (((len) RUMP_IOCPARM_MASK) RUMP_IOCPARM_SHIFT) | \ +((group) RUMP_IOCGROUP_SHIFT) | (num)) +#define _RUMP_IO(g,n) _RUMP_IOC(RUMP_IOC_VOID, (g), (n), 0) +#define _RUMP_IOR(g,n,t) _RUMP_IOC(RUMP_IOC_OUT, (g), (n), sizeof(t)) +#define _RUMP_IOW(g,n,t) _RUMP_IOC(RUMP_IOC_IN, (g), (n), sizeof(t)) +#define _RUMP_IOWR(g,n,t) _RUMP_IOC(RUMP_IOC_INOUT, (g), (n), sizeof(t)) + /* NetBSD: module.h,v 1.32 2012/10/17 17:48:48 dyoung Exp */ struct rump_modctl_load { const char *ml_filename; @@ -459,7 +480,7 @@ struct rump_modctl_load { size_t ml_propslen; }; -/* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */ +/* NetBSD: ufsmount.h,v 1.40 2013/06/16 13:33:30 hannken Exp */ struct rump_ufs_args { char *fspec; /* block special device to mount */ };
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: stacktic Date: Tue Jun 25 21:07:22 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: stacktic Date: Sat Jun 1 09:49:37 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Grab more network-related macros To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: stacktic Date: Sat Jun 1 09:50:32 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed May 15 16:00:04 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: Looks like I'm done revamping, so bump interface version to 17, where it will hopefully stay for all eternity (unless some snafus are discovered before NetBSD 7). To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/rump/include/rump/rumpuser.h 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/rumpuser.h diff -u src/sys/rump/include/rump/rumpuser.h:1.107 src/sys/rump/include/rump/rumpuser.h:1.108 --- src/sys/rump/include/rump/rumpuser.h:1.107 Wed May 15 15:57:01 2013 +++ src/sys/rump/include/rump/rumpuser.h Wed May 15 16:00:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser.h,v 1.107 2013/05/15 15:57:01 pooka Exp $ */ +/* $NetBSD: rumpuser.h,v 1.108 2013/05/15 16:00:04 pooka Exp $ */ /* * Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved. @@ -42,7 +42,11 @@ struct lwp; * init */ -#define RUMPUSER_VERSION 16 +/* + * Bumping this causes all kinds of havoc for implementations + * outside of the NetBSD tree, so try to avoid it. + */ +#define RUMPUSER_VERSION 17 /* hypervisor upcall routines */ struct rumpuser_hyperup {
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed May 15 16:00:04 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: Looks like I'm done revamping, so bump interface version to 17, where it will hopefully stay for all eternity (unless some snafus are discovered before NetBSD 7). To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/rump/include/rump/rumpuser.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed May 8 00:25:31 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Grab the sysvbfs args structure too, since the fs is useful for simple testing. Incidentally, the structure is exactly the same as for UFS... To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.14 src/sys/rump/include/rump/makerumpdefs.sh:1.15 --- src/sys/rump/include/rump/makerumpdefs.sh:1.14 Tue Apr 30 11:29:12 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Wed May 8 00:25:31 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.14 2013/04/30 11:29:12 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.15 2013/05/08 00:25:31 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -67,4 +67,7 @@ getstruct ../../../sys/module.h modctl_l fromvers ../../../ufs/ufs/ufsmount.h getstruct ../../../ufs/ufs/ufsmount.h ufs_args +fromvers ../../../fs/sysvbfs/sysvbfs_args.h +getstruct ../../../fs/sysvbfs/sysvbfs_args.h sysvbfs_args + printf '\n#endif /* _RUMP_RUMPDEFS_H_ */\n'
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed May 8 00:25:55 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.18 src/sys/rump/include/rump/rumpdefs.h:1.19 --- src/sys/rump/include/rump/rumpdefs.h:1.18 Tue Apr 30 12:39:21 2013 +++ src/sys/rump/include/rump/rumpdefs.h Wed May 8 00:25:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.18 2013/04/30 12:39:21 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.19 2013/05/08 00:25:55 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -291,4 +291,9 @@ struct rump_ufs_args { char *fspec; /* block special device to mount */ }; +/* NetBSD: sysvbfs_args.h,v 1.1 2008/09/04 12:07:30 pooka Exp */ +struct rump_sysvbfs_args { + char *fspec; /* blocks special holding the fs to mount */ +}; + #endif /* _RUMP_RUMPDEFS_H_ */
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed May 8 00:57:06 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: grab mount-related macros too To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/rump/include/rump/makerumpdefs.sh 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/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.15 src/sys/rump/include/rump/makerumpdefs.sh:1.16 --- src/sys/rump/include/rump/makerumpdefs.sh:1.15 Wed May 8 00:25:31 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Wed May 8 00:57:06 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.15 2013/05/08 00:25:31 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.16 2013/05/08 00:57:06 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -61,6 +61,12 @@ sed -n '/#define[ ]*SO_[A-Z]/s/SO_/RUMP sed -n '/#define[ ]*SOL_[A-Z]/s/SOL_/RUMP_/gp' ../../../sys/socket.h \ | sed 's,/\*.*$,,' +fromvers ../../../sys/mount.h +sed -n '/#define[ ]*MOUNT_[A-Z]/s/MOUNT_/RUMP_MOUNT_/gp' ../../../sys/mount.h | sed 's,/\*.*$,,' + +fromvers ../../../sys/fstypes.h +sed -n '/#define[ ]*MNT_[A-Z].*[^\]$/s/MNT_/RUMP_MNT_/gp' ../../../sys/fstypes.h | sed 's,/\*.*$,,' + fromvers ../../../sys/module.h getstruct ../../../sys/module.h modctl_load
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed May 8 00:57:25 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/rump/include/rump/rumpdefs.h 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/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.19 src/sys/rump/include/rump/rumpdefs.h:1.20 --- src/sys/rump/include/rump/rumpdefs.h:1.19 Wed May 8 00:25:55 2013 +++ src/sys/rump/include/rump/rumpdefs.h Wed May 8 00:57:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.19 2013/05/08 00:25:55 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.20 2013/05/08 00:57:24 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -276,6 +276,78 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_SO_RCVTIMEO 0x100c #define RUMP_SOL_SOCKET 0x +/* NetBSD: mount.h,v 1.209 2013/04/26 22:27:16 mlelstv Exp */ +#define RUMP_MOUNT_FFS ffs +#define RUMP_MOUNT_UFS RUMP_MOUNT_FFS +#define RUMP_MOUNT_NFS nfs +#define RUMP_MOUNT_MFS mfs +#define RUMP_MOUNT_MSDOS msdos +#define RUMP_MOUNT_LFS lfs +#define RUMP_MOUNT_FDESC fdesc +#define RUMP_MOUNT_NULL null +#define RUMP_MOUNT_OVERLAY overlay +#define RUMP_MOUNT_UMAP umap +#define RUMP_MOUNT_KERNFS kernfs +#define RUMP_MOUNT_PROCFS procfs +#define RUMP_MOUNT_AFS afs +#define RUMP_MOUNT_CD9660 cd9660 +#define RUMP_MOUNT_UNION union +#define RUMP_MOUNT_ADOSFS adosfs +#define RUMP_MOUNT_EXT2FS ext2fs +#define RUMP_MOUNT_CFS coda +#define RUMP_MOUNT_CODA RUMP_MOUNT_CFS +#define RUMP_MOUNT_FILECORE filecore +#define RUMP_MOUNT_NTFS ntfs +#define RUMP_MOUNT_SMBFS smbfs +#define RUMP_MOUNT_PTYFS ptyfs +#define RUMP_MOUNT_TMPFS tmpfs +#define RUMP_MOUNT_UDF udf +#define RUMP_MOUNT_SYSVBFS sysvbfs +#define RUMP_MOUNT_PUFFS puffs +#define RUMP_MOUNT_HFS hfs +#define RUMP_MOUNT_EFS efs +#define RUMP_MOUNT_ZFS zfs +#define RUMP_MOUNT_NILFS nilfs +#define RUMP_MOUNT_RUMPFS rumpfs +#define RUMP_MOUNT_V7FS v7fs + +/* NetBSD: fstypes.h,v 1.32 2012/11/26 16:22:21 drochner Exp */ +#define RUMP_MNT_RDONLY 0x0001 +#define RUMP_MNT_SYNCHRONOUS 0x0002 +#define RUMP_MNT_NOEXEC 0x0004 +#define RUMP_MNT_NOSUID 0x0008 +#define RUMP_MNT_NODEV 0x0010 +#define RUMP_MNT_UNION 0x0020 +#define RUMP_MNT_ASYNC 0x0040 +#define RUMP_MNT_NOCOREDUMP 0x8000 +#define RUMP_MNT_RELATIME 0x0002 +#define RUMP_MNT_IGNORE 0x0010 +#define RUMP_MNT_DISCARD 0x0080 +#define RUMP_MNT_EXTATTR 0x0100 +#define RUMP_MNT_LOG 0x0200 +#define RUMP_MNT_NOATIME 0x0400 +#define RUMP_MNT_SYMPERM 0x2000 +#define RUMP_MNT_NODEVMTIME 0x4000 +#define RUMP_MNT_SOFTDEP 0x8000 +#define RUMP_MNT_EXRDONLY 0x0080 +#define RUMP_MNT_EXPORTED 0x0100 +#define RUMP_MNT_DEFEXPORTED 0x0200 +#define RUMP_MNT_EXPORTANON 0x0400 +#define RUMP_MNT_EXKERB 0x0800 +#define RUMP_MNT_EXNORESPORT 0x0800 +#define RUMP_MNT_EXPUBLIC 0x1000 +#define RUMP_MNT_LOCAL 0x1000 +#define RUMP_MNT_QUOTA 0x2000 +#define RUMP_MNT_ROOTFS 0x4000 +#define RUMP_MNT_UPDATE 0x0001 +#define RUMP_MNT_RELOAD 0x0004 +#define RUMP_MNT_FORCE 0x0008 +#define RUMP_MNT_GETARGS 0x0040 +#define RUMP_MNT_OP_FLAGS (RUMP_MNT_UPDATE|RUMP_MNT_RELOAD|RUMP_MNT_FORCE|RUMP_MNT_GETARGS) +#define RUMP_MNT_WAIT 1 +#define RUMP_MNT_NOWAIT 2 +#define RUMP_MNT_LAZY 3 + /* NetBSD: module.h,v 1.32 2012/10/17 17:48:48 dyoung Exp */ struct rump_modctl_load { const char *ml_filename;
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed May 8 00:25:31 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Grab the sysvbfs args structure too, since the fs is useful for simple testing. Incidentally, the structure is exactly the same as for UFS... To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed May 8 00:25:55 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed May 8 00:57:06 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: grab mount-related macros too To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed May 8 00:57:25 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.