subject:"CVS commit\: src\/sys\/rump\/include\/rump"

CVS commit: src/sys/rump/include/rump

2020-06-14 Thread Kamil Rytarowski

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

2020-06-14 Thread Kamil Rytarowski

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

2018-08-21 Thread Christos Zoulas

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

2018-08-21 Thread Christos Zoulas

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

2018-08-21 Thread SAITOH Masanobu

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

2017-05-11 Thread Christos Zoulas

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

2017-05-11 Thread Christos Zoulas

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-sys

2016-02-02 Thread Antti Kantee

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

2016-02-01 Thread Antti Kantee

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

2016-02-01 Thread Antti Kantee

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

2016-02-01 Thread Antti Kantee

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

2016-01-29 Thread Christos Zoulas

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

2016-01-25 Thread Antti Kantee

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

2016-01-07 Thread Antti Kantee

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

2015-11-01 Thread Antti Kantee

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 Millan  via 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

2015-09-15 Thread Antti Kantee

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 ECONN

CVS commit: src/sys/rump/include/rump

2015-09-15 Thread Antti Kantee

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

2015-09-10 Thread Antti Kantee

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

2015-09-10 Thread Antti Kantee

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

2015-09-10 Thread Antti Kantee

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

2015-09-10 Thread Antti Kantee

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

2015-01-03 Thread Antti Kantee

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

2014-06-18 Thread Alexander Nasonov

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

2014-03-10 Thread Antti Kantee

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

2013-12-18 Thread Antti Kantee

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: /* (ENO

CVS commit: src/sys/rump/include/rump

2013-12-18 Thread Antti Kantee

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 3>&1 > 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 1>&3
+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!' 1>&3
+	rm -f rumpdefs.h rumperr.h
+	exit 1
+fi
+
+exit 0

CVS commit: src/sys/rump/include/rump

2013-12-11 Thread Antti Kantee

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

2013-12-11 Thread Antti Kantee

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

2013-12-09 Thread Antti Kantee

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	(1<> 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

2013-12-09 Thread Antti Kantee

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

2013-11-13 Thread Antti Kantee

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 
 
-/*	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

2013-11-13 Thread Antti Kantee

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

2013-08-15 Thread Antti Kantee

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

2013-08-15 Thread Antti Kantee

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

2013-08-15 Thread Antti Kantee

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

2013-08-15 Thread Antti Kantee

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

2013-08-15 Thread Antti Kantee

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

2013-08-15 Thread Antti Kantee

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  /* typedefs */
 #include  /* typedefs */
 #include  /* typedefs */
 
 #include  /* typedefs */
+#endif
 
 #ifdef __NetBSD__
 #include

CVS commit: src/sys/rump/include/rump

2013-08-15 Thread Antti Kantee

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

2013-08-15 Thread Antti Kantee

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

2013-08-15 Thread Antti Kantee

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

2013-07-16 Thread Antti Kantee

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

2013-06-25 Thread Arnaud Ysmal

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

2013-06-25 Thread Arnaud Ysmal

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

2013-06-01 Thread Arnaud Ysmal

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.

Modified files:

Index: src/sys/rump/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.20 src/sys/rump/include/rump/rumpdefs.h:1.21
--- src/sys/rump/include/rump/rumpdefs.h:1.20	Wed May  8 00:57:24 2013
+++ src/sys/rump/include/rump/rumpdefs.h	Sat Jun  1 09:50:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.20 2013/05/08 00:57:24 pooka Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.21 2013/06/01 09:50:32 stacktic Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -275,6 +275,107 @@ enum rump_vtype	{ RUMP_VNON, RUMP_VREG, 
 #define RUMP_SO_SNDTIMEO	0x100b		
 #define RUMP_SO_RCVTIMEO	0x100c		
 #define	RUMP_SOL_SOCKET	0x		
+#define	RUMP_MSG_OOB		0x0001		
+#define	RUMP_MSG_PEEK	0x0002		
+#define	RUMP_MSG_DONTROUTE	0x0004		
+#define	RUMP_MSG_EOR		0x0008		
+#define	RUMP_MSG_TRUNC	0x0010		
+#define	RUMP_MSG_CTRUNC	0x0020		
+#define	RUMP_MSG_WAITALL	0x0040		
+#define	RUMP_MSG_DONTWAIT	0x0080		
+#define	RUMP_MSG_BCAST	0x0100		
+#define	RUMP_MSG_MCAST	0x0200		
+#define	RUMP_MSG_NOSIGNAL	0x0400		
+#define	RUMP_MSG_CRUMP_MSG_CLOEXEC 0x0800		
+#define	RUMP_MSG_NBIO	0x1000		
+#define	RUMP_MSG_WAITFORONE	0x2000		
+#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.88 2013/04/27 21:35:24 joerg Exp 	*/
+#define	RUMP_IP_OPTIONS		1
+#define	RUMP_IP_HDRINCL		2
+#define	RUMP_IP_TOS			3
+#define	RUMP_IP_TTL			4
+#define	RUMP_IP_RECVOPTS		5
+#define	RUMP_IP_RECVRETOPTS		6
+#define	RUMP_IP_RECVDSTADDR		7
+#define	RUMP_IP_RETOPTS		8
+#define	RUMP_IP_MULTICAST_IF		9
+#define	RUMP_IP_MULTICAST_TTL	10   
+#define	RUMP_IP_MULTICAST_LOOP	11   
+#define	RUMP_IP_ADD_MEMBERSHIP	12   
+#define	RUMP_IP_DROP_MEMBERSHIP	13   
+#define	RUMP_IP_PORTALGO		18   
+#define	RUMP_IP_PORTRANGE		19   
+#define	RUMP_IP_RECVIF		20   
+#define	RUMP_IP_ERRORMTU		21   
+#define	RUMP_IP_IPSEC_POLICY		22 
+#define	RUMP_IP_RECVTTL		23   
+#define	RUMP_IP_MINTTL		24   
+#define	RUMP_IP_DEFAULT_MULTICAST_TTL  1	
+#define	RUMP_IP_DEFAULT_MULTICAST_LOOP 1	
+#define	RUMP_IP_MAX_MEMBERSHIPS	20	
+#define	RUMP_IP_PORTRANGE_DEFAULT	0	
+#define	RUMP_IP_PORTRANGE_HIGH	1	
+#define	RUMP_IP_PORTRANGE_LOW	2	
+#define	RUMP_IPPROTO_IP		0		
+#define	RUMP_IPPROTO_HOPOPTS		0		
+#define	RUMP_IPPROTO_ICMP		1		
+#define	RUMP_IPPROTO_IGMP		2		
+#define	RUMP_IPPROTO_GGP		3		
+#define	RUMP_IPPROTO_IPV4		4 		
+#define	RUMP_IPPROTO_IPIP		4		
+#define	RUMP_IPPROTO_TCP		6		
+#define	RUMP_IPPROTO_EGP		8		
+#define	RUMP_IPPROTO_PUP		12		
+#define	RUMP_IPPROTO_UDP		17		
+#define	RUMP_IPPROTO_IDP		22		
+#define	RUMP_IPPROTO_TP		29 		
+#define	RUMP_IPPROTO_IPV6		41		
+#define	RUMP_IPPROTO_ROUTING		43		
+#define	RUMP_IPPROTO_FRAGMENT	44		
+#define	RUMP_IPPROTO_RSVP		46		
+#define	RUMP_IPPROTO_GRE		47		
+#define	RUMP_IPPROTO_ESP		50 		
+#define	RUMP_IPPROTO_AH		51 		
+#define	RUMP_IPPROTO_MOBILE		55		
+#define	RUMP_IPPROTO_IPV6_ICMP	58		
+#define	RUMP_IPPROTO_ICMPV6		58		
+#define	RUMP_IPPROTO_NONE		59		
+#define	RUMP_IPPROTO_DSTOPTS		60		
+#define	RUMP_IPPROTO_EON		80		
+#define	RUMP_IPPROTO_ETHERIP		97		
+#define	RUMP_IPPROTO_ENCAP		98		
+#define	RUMP_IPPROTO_PIM		103		
+#define	RUMP_IPPROTO_IPCOMP		108		
+#define	RUMP_IPPROTO_VRRP		112		
+#define	RUMP_IPPROTO_CARP		112		
+#define RUMP_IPPROTO_PFSYNC  240 
+#define	RUMP_IPPROTO_RAW		255		
+#define	RUMP_IPPROTO_MAX		256
+#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 	*/
+#define	RUMP_TCP_MSS		536
+#define	RUMP_TCP_MINMSS	216
+#define	RUMP_TCP_MAXWIN	65535	
+#define	RUMP_TCP_MAX_WINSHIFT	14	
+#define	RUMP_TCP_MAXBURST	4	
+#define	RUMP_TCP_NODELAY	1	
+#define	RUMP_TCP_MAXSEG	2	
+#define	RUMP_TCP_KEEPIDLE	3
+#define	RUMP_TCP_NOPUSH	4	
+#define	RUMP_TCP_KEEPINTVL	5
+#define	RUMP_TCP_KEEPCNT	6
+#define	RUMP_TCP_KEEPINIT	7
+#define	RUMP_TCP_NOOPT	8	
+#define	RUMP_TCP_MD5SIG	0x10	
+#define	RUMP_TCP_CONGCTL	0x20	
 
 /*	NetBSD: mount.h,v 1.209 2013/04/26 22:27:16 mlelstv Exp 	*/
 #define	RUMP_MOUNT_FFS	"ffs"

CVS commit: src/sys/rump/include/rump

2013-06-01 Thread Arnaud Ysmal

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.

Modified files:

Index: src/sys/rump/include/rump/makerumpdefs.sh
diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.16 src/sys/rump/include/rump/makerumpdefs.sh:1.17
--- src/sys/rump/include/rump/makerumpdefs.sh:1.16	Wed May  8 00:57:06 2013
+++ src/sys/rump/include/rump/makerumpdefs.sh	Sat Jun  1 09:49:37 2013
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
 rm -f rumpdefs.h
 exec > rumpdefs.h
 
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.16 2013/05/08 00:57:06 pooka Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.17 2013/06/01 09:49:37 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'
@@ -60,6 +60,18 @@ sed -n '/#define[ 	]*SO_[A-Z]/s/SO_/RUMP
 | sed 's,/\*.*$,,'
 sed -n '/#define[ 	]*SOL_[A-Z]/s/SOL_/RUMP_&/gp' <../../../sys/socket.h \
 | sed 's,/\*.*$,,'
+sed -n '/#define[ 	]*MSG_[A-Z]/s/MSG_/RUMP_&/gp' <../../../sys/socket.h \
+| sed 's,/\*.*$,,'
+
+fromvers ../../../netinet/in.h
+sed -n '/#define[ 	]*IP_[A-Z]/s/IP_/RUMP_&/gp' <../../../netinet/in.h \
+| sed 's,/\*.*$,,'
+sed -n '/#define[ 	]*IPPROTO_[A-Z]/s/IPPROTO_/RUMP_&/gp' <../../../netinet/in.h \
+| sed 's,/\*.*$,,'
+
+fromvers ../../../netinet/tcp.h
+sed -n '/#define[ 	]*TCP_[A-Z]/s/TCP_/RUMP_&/gp' <../../../netinet/tcp.h \
+| sed 's,/\*.*$,,'
 
 fromvers ../../../sys/mount.h
 sed -n '/#define[ 	]*MOUNT_[A-Z]/s/MOUNT_/RUMP_MOUNT_/gp' <../../../sys/mount.h | sed 's,/\*.*$,,'

CVS commit: src/sys/rump/include/rump

2013-05-15 Thread Antti Kantee

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

2013-05-07 Thread Antti Kantee

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

2013-05-07 Thread Antti Kantee

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

2013-05-07 Thread Antti Kantee

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

2013-05-07 Thread Antti Kantee

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

2013-04-30 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue Apr 30 11:29:12 UTC 2013

Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh

Log Message:
fix sed command


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/sys/rump/include/rump/makerumpdefs.sh:1.14
--- src/sys/rump/include/rump/makerumpdefs.sh:1.13	Thu Dec 13 17:17:00 2012
+++ src/sys/rump/include/rump/makerumpdefs.sh	Tue Apr 30 11:29:12 2013
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
 rm -f rumpdefs.h
 exec > rumpdefs.h
 
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.13 2012/12/13 17:17:00 pooka Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.14 2013/04/30 11:29: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'
@@ -38,7 +38,7 @@ sed -n '/#define	O_[A-Z]*	*0x/s/O_/RUMP_
 < ../../../sys/fcntl.h
 
 fromvers ../../../sys/vnode.h
-sed -n '/enum vtype.*{/{s/vtype/rump_&/;s/ V/ RUMP_V/gp}' < ../../../sys/vnode.h
+sed -n '/enum vtype.*{/{s/vtype/rump_&/;s/ V/ RUMP_V/gp;}' <../../../sys/vnode.h
 sed -n '/#define.*LK_[A-Z]/s/LK_/RUMP_LK_/gp' <../../../sys/vnode.h	\
 | sed 's,/\*.*$,,'

CVS commit: src/sys/rump/include/rump

2013-04-29 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Apr 29 17:35:04 UTC 2013

Modified Files:
src/sys/rump/include/rump: rumpuser.h

Log Message:
remove accidentally committed bit


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 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.95 src/sys/rump/include/rump/rumpuser.h:1.96
--- src/sys/rump/include/rump/rumpuser.h:1.95	Mon Apr 29 17:31:05 2013
+++ src/sys/rump/include/rump/rumpuser.h	Mon Apr 29 17:35:04 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.95 2013/04/29 17:31:05 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.96 2013/04/29 17:35:04 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2013 Antti Kantee.  All Rights Reserved.
@@ -62,7 +62,6 @@ struct rumpuser_hyperup {
 	void *hyp__extra[8];
 };
 int rumpuser_init(int, const struct rumpuser_hyperup *);
-void rumpuser_fini(void);
 
 /*
  * memory allocation

CVS commit: src/sys/rump/include/rump

2013-04-29 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Apr 29 14:07:02 UTC 2013

Modified Files:
src/sys/rump/include/rump: rumpuser.h

Log Message:
regroup calls a bit and sprinkle comments
no functional change for a change


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 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.91 src/sys/rump/include/rump/rumpuser.h:1.92
--- src/sys/rump/include/rump/rumpuser.h:1.91	Mon Apr 29 13:21:03 2013
+++ src/sys/rump/include/rump/rumpuser.h	Mon Apr 29 14:07:01 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.91 2013/04/29 13:21:03 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.92 2013/04/29 14:07:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2013 Antti Kantee.  All Rights Reserved.
@@ -37,28 +37,28 @@
 #error The rump/rumpuser.h interface is not for non-kernel consumers
 #endif
 
-#define RUMPUSER_VERSION 16
-
-int rumpuser_daemonize_begin(void);
-int rumpuser_daemonize_done(int);
+/*
+ * init
+ */
 
+#define RUMPUSER_VERSION 16
 typedef void (*rump_reschedulefn)(int, void *);
 typedef void (*rump_unschedulefn)(int, int *, void *);
 int rumpuser_init(int, rump_reschedulefn, rump_unschedulefn);
 
-int rumpuser_getfileinfo(const char *, uint64_t *, int *, int *);
-#define RUMPUSER_FT_OTHER 0
-#define RUMPUSER_FT_DIR 1
-#define RUMPUSER_FT_REG 2
-#define RUMPUSER_FT_BLK 3
-#define RUMPUSER_FT_CHR 4
+/*
+ * memory allocation
+ */
 
 void *rumpuser_malloc(size_t, int);
 void rumpuser_free(void *, size_t);
-
 void *rumpuser_anonmmap(void *, size_t, int, int, int *);
 void  rumpuser_unmap(void *, size_t);
 
+/*
+ * files and I/O
+ */
+
 #define RUMPUSER_OPEN_RDONLY	0x
 #define RUMPUSER_OPEN_WRONLY	0x0001
 #define RUMPUSER_OPEN_RDWR	0x0002
@@ -68,6 +68,13 @@ void  rumpuser_unmap(void *, size_t);
 #define RUMPUSER_OPEN_BIO	0x0010 /* open device for block i/o */
 int rumpuser_open(const char *, int, int *);
 
+#define RUMPUSER_FT_OTHER 0
+#define RUMPUSER_FT_DIR 1
+#define RUMPUSER_FT_REG 2
+#define RUMPUSER_FT_BLK 3
+#define RUMPUSER_FT_CHR 4
+int rumpuser_getfileinfo(const char *, uint64_t *, int *, int *);
+
 int rumpuser_close(int, int *);
 int rumpuser_fsync(int, int *);
 
@@ -89,32 +96,56 @@ struct rumpuser_iovec {
 ssize_t rumpuser_readv(int, const struct rumpuser_iovec *, int, int *);
 ssize_t rumpuser_writev(int, const struct rumpuser_iovec *, int, int *);
 
+/*
+ * clock and zzz
+ */
+
 enum rumpclock { RUMPUSER_CLOCK_RELWALL, RUMPUSER_CLOCK_ABSMONO };
 int rumpuser_clock_gettime(uint64_t *, uint64_t *, enum rumpclock);
 int rumpuser_clock_sleep(uint64_t, uint64_t, enum rumpclock);
 
-int rumpuser_getenv(const char *, char *, size_t, int *);
+/*
+ * host information retrieval
+ */
 
+int rumpuser_getenv(const char *, char *, size_t, int *);
+int rumpuser_getnhostcpu(void);
 int rumpuser_gethostname(char *, size_t, int *);
 
-int rumpuser_putchar(int, int *);
+/*
+ * system call emulation, set errno is TLS
+ */
+
+void rumpuser_seterrno(int);
+
+/*
+ * termination
+ */
 
 #define RUMPUSER_PID_SELF ((int64_t)-1)
 int rumpuser_kill(int64_t, int, int *);
-
 #define RUMPUSER_PANIC (-1)
 void rumpuser_exit(int) __dead;
-void rumpuser_seterrno(int);
 
+/*
+ * console output
+ */
+
+int rumpuser_putchar(int, int *);
 int rumpuser_dprintf(const char *, ...) __printflike(1, 2);
 
-int rumpuser_getnhostcpu(void);
+/*
+ * access to host random pool
+ */
 
 /* always succeeds unless NOWAIT is given */
 #define RUMPUSER_RANDOM_HARD	0x01
 #define RUMPUSER_RANDOM_NOWAIT	0x02
 size_t rumpuser_getrandom(void *, size_t, int);
 
+/*
+ * threads, scheduling (host) and synchronization
+ */
 int  rumpuser_thread_create(void *(*f)(void *), void *, const char *, int,
 			void **);
 void rumpuser_thread_exit(void) __dead;
@@ -156,7 +187,9 @@ void rumpuser_cv_signal(struct rumpuser_
 void rumpuser_cv_broadcast(struct rumpuser_cv *);
 int  rumpuser_cv_has_waiters(struct rumpuser_cv *);
 
-/* rumpuser dynloader */
+/*
+ * dynloader
+ */
 
 struct modinfo;
 struct rump_component;
@@ -166,7 +199,16 @@ typedef void (*rump_compload_fn)(const s
 void rumpuser_dl_bootstrap(rump_modinit_fn, rump_symload_fn, rump_compload_fn);
 void *rumpuser_dl_globalsym(const char *);
 
-/* syscall proxy routines */
+/*
+ * misc management
+ */
+
+int rumpuser_daemonize_begin(void);
+int rumpuser_daemonize_done(int);
+
+/*
+ * syscall proxy
+ */
 
 struct rumpuser_sp_ops {
 	void (*spop_schedule)(void);

CVS commit: src/sys/rump/include/rump

2013-04-27 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sat Apr 27 16:05:55 UTC 2013

Modified Files:
src/sys/rump/include/rump: rumpuser.h

Log Message:
move struct lwp forward decl before its first use.  otherwise it's rather
pointless.  some whitespace landscaping too.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 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.82 src/sys/rump/include/rump/rumpuser.h:1.83
--- src/sys/rump/include/rump/rumpuser.h:1.82	Sat Apr 27 16:02:55 2013
+++ src/sys/rump/include/rump/rumpuser.h	Sat Apr 27 16:05:54 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.82 2013/04/27 16:02:55 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.83 2013/04/27 16:05:54 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -130,8 +130,11 @@ int  rumpuser_thread_create(void *(*f)(v
 void rumpuser_thread_exit(void) __dead;
 int  rumpuser_thread_join(void *);
 
-struct rumpuser_mtx;
+struct lwp;
+void rumpuser_set_curlwp(struct lwp *);
+struct lwp *rumpuser_get_curlwp(void);
 
+struct rumpuser_mtx;
 void rumpuser_mutex_init(struct rumpuser_mtx **);
 void rumpuser_mutex_init_kmutex(struct rumpuser_mtx **, int);
 void rumpuser_mutex_enter(struct rumpuser_mtx *);
@@ -142,7 +145,6 @@ void rumpuser_mutex_destroy(struct rumpu
 struct lwp *rumpuser_mutex_owner(struct rumpuser_mtx *);
 
 struct rumpuser_rw;
-
 void rumpuser_rw_init(struct rumpuser_rw **);
 void rumpuser_rw_enter(struct rumpuser_rw *, int);
 int  rumpuser_rw_tryenter(struct rumpuser_rw *, int);
@@ -153,7 +155,6 @@ int  rumpuser_rw_rdheld(struct rumpuser_
 int  rumpuser_rw_wrheld(struct rumpuser_rw *);
 
 struct rumpuser_cv;
-
 void rumpuser_cv_init(struct rumpuser_cv **);
 void rumpuser_cv_destroy(struct rumpuser_cv *);
 void rumpuser_cv_wait(struct rumpuser_cv *, struct rumpuser_mtx *);
@@ -164,11 +165,6 @@ void rumpuser_cv_signal(struct rumpuser_
 void rumpuser_cv_broadcast(struct rumpuser_cv *);
 int  rumpuser_cv_has_waiters(struct rumpuser_cv *);
 
-struct lwp;
-
-void rumpuser_set_curlwp(struct lwp *);
-struct lwp *rumpuser_get_curlwp(void);
-
 /* "aio" stuff for being able to fire of a B_ASYNC I/O and continue */
 struct rumpuser_aio {
 	int	rua_fd;

CVS commit: src/sys/rump/include/rump

2013-04-27 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sat Apr 27 15:32:37 UTC 2013

Modified Files:
src/sys/rump/include/rump: rumpuser.h

Log Message:
Let the includer figure out where to get stdint or equivalent from.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 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.79 src/sys/rump/include/rump/rumpuser.h:1.80
--- src/sys/rump/include/rump/rumpuser.h:1.79	Sat Apr 27 15:01:21 2013
+++ src/sys/rump/include/rump/rumpuser.h	Sat Apr 27 15:32:36 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.79 2013/04/27 15:01:21 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.80 2013/04/27 15:32:36 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -28,16 +28,15 @@
 #ifndef _RUMP_RUMPUSER_H_
 #define _RUMP_RUMPUSER_H_
 
+/*
+ * Do not include any headers here!  Implementation must take care of
+ * having stdint or equivalent included before including this header.
+ */
+
 #if !defined(_KERNEL) && !defined(LIBRUMPUSER)
 #error The rump/rumpuser.h interface is not for non-kernel consumers
 #endif
 
-#ifdef _KERNEL
-#include 
-#else
-#include 
-#endif
-
 #define RUMPUSER_VERSION 16
 
 int rumpuser_daemonize_begin(void);

CVS commit: src/sys/rump/include/rump

2013-04-27 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sat Apr 27 14:02:17 UTC 2013

Modified Files:
src/sys/rump/include/rump: rumpuser.h

Log Message:
remove prototypes for interfaces no longer provided


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 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.76 src/sys/rump/include/rump/rumpuser.h:1.77
--- src/sys/rump/include/rump/rumpuser.h:1.76	Sat Apr 27 13:59:46 2013
+++ src/sys/rump/include/rump/rumpuser.h	Sat Apr 27 14:02:17 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.76 2013/04/27 13:59:46 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.77 2013/04/27 14:02:17 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -44,9 +44,7 @@ int rumpuser_getversion(void);
 int rumpuser_daemonize_begin(void);
 int rumpuser_daemonize_done(int);
 
-struct msghdr;
 struct pollfd;
-struct sockaddr;
 
 typedef void (*kernel_lockfn)(int, void *);
 typedef void (*kernel_unlockfn)(int, int *, void *);
@@ -198,20 +196,6 @@ extern struct rumpuser_cv rumpuser_aio_c
 extern struct rumpuser_aio rumpuser_aios[N_AIOS];
 extern int rumpuser_aio_head, rumpuser_aio_tail;
 
-/* rumpuser_net */
-
-int  rumpuser_net_socket(int, int, int, int *);
-int  rumpuser_net_sendmsg(int, const struct msghdr *, int, int *);
-int  rumpuser_net_recvmsg(int, struct msghdr *, int, int *);
-int  rumpuser_net_connect(int, const struct sockaddr *, int, int *);
-int  rumpuser_net_bind(int, const struct sockaddr *, int, int *);
-int  rumpuser_net_accept(int, struct sockaddr *, int *, int *);
-int  rumpuser_net_listen(int, int, int *);
-enum rumpuser_getnametype { RUMPUSER_SOCKNAME, RUMPUSER_PEERNAME };
-int  rumpuser_net_getname(int, struct sockaddr *, int *,
-			  enum rumpuser_getnametype, int *);
-int  rumpuser_net_setsockopt(int, int, int, const void *, int, int *);
-
 /* rumpuser dynloader */
 
 struct modinfo;

CVS commit: src/sys/rump/include/rump

2013-03-28 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Mar 29 01:51:25 UTC 2013

Modified Files:
src/sys/rump/include/rump: rump_syscalls.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/rump/include/rump/rump_syscalls.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.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.61 src/sys/rump/include/rump/rump_syscalls.h:1.62
--- src/sys/rump/include/rump/rump_syscalls.h:1.61	Mon Oct  1 21:46:21 2012
+++ src/sys/rump/include/rump/rump_syscalls.h	Thu Mar 28 21:51:25 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.61 2012/10/02 01:46:21 christos Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.62 2013/03/29 01:51:25 christos Exp $ */
 
 /*
  * System call protos in rump namespace.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.261 2012/10/02 01:44:28 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.262 2013/03/29 01:08:17 christos Exp
  */
 
 #ifndef _RUMP_RUMP_SYSCALLS_H_

CVS commit: src/sys/rump/include/rump

2013-03-07 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Thu Mar  7 18:51:03 UTC 2013

Modified Files:
src/sys/rump/include/rump: rumpkern_if_pub.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/include/rump/rumpkern_if_pub.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/rumpkern_if_pub.h
diff -u src/sys/rump/include/rump/rumpkern_if_pub.h:1.13 src/sys/rump/include/rump/rumpkern_if_pub.h:1.14
--- src/sys/rump/include/rump/rumpkern_if_pub.h:1.13	Sun Jan  2 12:53:13 2011
+++ src/sys/rump/include/rump/rumpkern_if_pub.h	Thu Mar  7 18:51:02 2013
@@ -1,9 +1,9 @@
-/*	$NetBSD: rumpkern_if_pub.h,v 1.13 2011/01/02 12:53:13 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_pub.h,v 1.14 2013/03/07 18:51:02 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.10 2011/01/02 12:52:25 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.5 2010/09/01 19:32:11 pooka Exp 
+ * from: NetBSD: rumpkern.ifspec,v 1.11 2013/03/07 18:49:13 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.6 2013/02/14 10:54:54 pooka Exp 
  */
 
 int rump_pub_getversion(void);
@@ -21,4 +21,5 @@ int rump_pub_lwproc_newlwp(pid_t);
 void rump_pub_lwproc_switch(struct lwp *);
 void rump_pub_lwproc_releaselwp(void);
 struct lwp * rump_pub_lwproc_curlwp(void);
+void rump_pub_lwproc_sysent_usenative(void);
 void rump_pub_allbetsareoff_setid(pid_t, int);

CVS commit: src/sys/rump/include/rump

2013-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Thu Jan 17 23:21:20 UTC 2013

Modified Files:
src/sys/rump/include/rump: rump_syscalls_compat.h

Log Message:
Helps ELF platforms if I spell __ELF__ correctly ...


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/sys/rump/include/rump/rump_syscalls_compat.h:1.10
--- src/sys/rump/include/rump/rump_syscalls_compat.h:1.9	Thu Jan 17 21:12:39 2013
+++ src/sys/rump/include/rump/rump_syscalls_compat.h	Thu Jan 17 23:21:20 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_syscalls_compat.h,v 1.9 2013/01/17 21:12:39 pooka Exp $	*/
+/*	$NetBSD: rump_syscalls_compat.h,v 1.10 2013/01/17 23:21:20 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -54,7 +54,7 @@
 #else /* !__NetBSD__ */
 
 #ifndef __RENAME
-#ifdef __ELF
+#ifdef __ELF__
 #define __RUMPSTRINGIFY(x) #x
 #else
 #define __RUMPSTRINGIFY(x) "_"#x

CVS commit: src/sys/rump/include/rump

2013-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Thu Jan 17 21:12:39 UTC 2013

Modified Files:
src/sys/rump/include/rump: rump_syscalls_compat.h

Log Message:
For non-NetBSD, assume leading underscore with !__ELF__ (fixes PE-COFF)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.8 src/sys/rump/include/rump/rump_syscalls_compat.h:1.9
--- src/sys/rump/include/rump/rump_syscalls_compat.h:1.8	Fri Jul 20 09:10:23 2012
+++ src/sys/rump/include/rump/rump_syscalls_compat.h	Thu Jan 17 21:12:39 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_syscalls_compat.h,v 1.8 2012/07/20 09:10:23 pooka Exp $	*/
+/*	$NetBSD: rump_syscalls_compat.h,v 1.9 2013/01/17 21:12:39 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -54,7 +54,11 @@
 #else /* !__NetBSD__ */
 
 #ifndef __RENAME
+#ifdef __ELF
 #define __RUMPSTRINGIFY(x) #x
+#else
+#define __RUMPSTRINGIFY(x) "_"#x
+#endif /* __ELF__ */
 #define __RENAME(x) __asm(__RUMPSTRINGIFY(x))
 #endif /* __RENAME */

CVS commit: src/sys/rump/include/rump

2012-12-13 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Thu Dec 13 17:17:21 UTC 2012

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 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.16 src/sys/rump/include/rump/rumpdefs.h:1.17
--- src/sys/rump/include/rump/rumpdefs.h:1.16	Wed Nov 21 17:36:17 2012
+++ src/sys/rump/include/rump/rumpdefs.h	Thu Dec 13 17:17:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.16 2012/11/21 17:36:17 pooka Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.17 2012/12/13 17:17:21 pooka Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -9,7 +9,7 @@
 
 #include 
 
-/*	NetBSD: fcntl.h,v 1.42 2012/01/25 00:28:35 christos Exp 	*/
+/*	NetBSD: fcntl.h,v 1.43 2012/11/18 17:41:54 manu 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 */
@@ -276,4 +276,19 @@ enum rump_vtype	{ RUMP_VNON, RUMP_VREG, 
 #define RUMP_SO_RCVTIMEO	0x100c		
 #define	RUMP_SOL_SOCKET	0x		
 
+/*	NetBSD: module.h,v 1.32 2012/10/17 17:48:48 dyoung Exp 	*/
+struct rump_modctl_load {
+	const char *ml_filename;
+
+	int ml_flags;
+
+	const char *ml_props;
+	size_t ml_propslen;
+};
+
+/*	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 */
+};
+
 #endif /* _RUMP_RUMPDEFS_H_ */

CVS commit: src/sys/rump/include/rump

2012-12-13 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Thu Dec 13 17:17:00 UTC 2012

Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh

Log Message:
Add the ability to define compat structs and include a few.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 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.12 src/sys/rump/include/rump/makerumpdefs.sh:1.13
--- src/sys/rump/include/rump/makerumpdefs.sh:1.12	Wed Nov 21 17:35:21 2012
+++ src/sys/rump/include/rump/makerumpdefs.sh	Thu Dec 13 17:17:00 2012
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
 rm -f rumpdefs.h
 exec > rumpdefs.h
 
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.12 2012/11/21 17:35:21 pooka Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.13 2012/12/13 17:17: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'
@@ -19,6 +19,20 @@ fromvers () {
 	sed -n '1{s/\$//gp;q;}' $1
 }
 
+# not perfect, but works well enough for the cases so far
+getstruct () {
+	sed -n '/struct[ 	]*'"$2"'[ 	]*{/{
+		a\
+struct rump_'"$2"' {
+		:loop
+		n
+		s/^}.*;$/};/p
+		t
+		/#define/!p
+		b loop
+	}' < $1
+}
+
 fromvers ../../../sys/fcntl.h
 sed -n '/#define	O_[A-Z]*	*0x/s/O_/RUMP_O_/gp' \
 < ../../../sys/fcntl.h
@@ -47,4 +61,10 @@ 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/module.h
+getstruct ../../../sys/module.h modctl_load
+
+fromvers ../../../ufs/ufs/ufsmount.h
+getstruct ../../../ufs/ufs/ufsmount.h ufs_args
+
 printf '\n#endif /* _RUMP_RUMPDEFS_H_ */\n'

CVS commit: src/sys/rump/include/rump

2012-11-21 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Nov 21 17:36:18 UTC 2012

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.15 src/sys/rump/include/rump/rumpdefs.h:1.16
--- src/sys/rump/include/rump/rumpdefs.h:1.15	Sun Nov 18 21:20:16 2012
+++ src/sys/rump/include/rump/rumpdefs.h	Wed Nov 21 17:36:17 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.15 2012/11/18 21:20:16 pooka Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.16 2012/11/21 17:36:17 pooka Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -8,21 +8,6 @@
 #define _RUMP_RUMPDEFS_H_
 
 #include 
-#ifdef _KERNEL
-#include 
-#else
-#include 
-#endif
-
-struct rump_sockaddr_in {
-	uint8_t		sin_len;
-	uint8_t		sin_family;
-	uint16_t	sin_port;
-	struct {
-			uint32_t s_addr;
-	} sin_addr;
-	int8_t		sin_zero[8];
-};
 
 /*	NetBSD: fcntl.h,v 1.42 2012/01/25 00:28:35 christos Exp 	*/
 #define	RUMP_O_RDONLY	0x	/* open for reading only */

CVS commit: src/sys/rump/include/rump

2012-11-21 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Nov 21 17:35:21 UTC 2012

Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh

Log Message:
ok, rump_sockaddr_in was a pretty desperate kludge in the first place,
much better solved by syscall compat.  but, now it's really time to let
it go since solaris thinks it's nice to define s_addr around any way
it likes.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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.11 src/sys/rump/include/rump/makerumpdefs.sh:1.12
--- src/sys/rump/include/rump/makerumpdefs.sh:1.11	Sun Nov 18 21:19:52 2012
+++ src/sys/rump/include/rump/makerumpdefs.sh	Wed Nov 21 17:35:21 2012
@@ -8,38 +8,17 @@ echo Generating rumpdefs.h
 rm -f rumpdefs.h
 exec > rumpdefs.h
 
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.11 2012/11/18 21:19:52 pooka Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.12 2012/11/21 17:35:21 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'
 printf '#include \n'
-printf '#ifdef _KERNEL\n'
-printf '#include \n'
-printf '#else\n'
-printf '#include \n'
-printf '#endif\n'
 
 fromvers () {
 	echo
 	sed -n '1{s/\$//gp;q;}' $1
 }
 
-# Odds of sockaddr_in changing are zero, so no acrobatics needed.  Alas,
-# dealing with in_addr_t for s_addr is very difficult, so have it as
-# an incompatible uint32_t for now.
-echo
-cat <

CVS commit: src/sys/rump/include/rump

2012-11-18 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sun Nov 18 21:20:16 UTC 2012

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/sys/rump/include/rump/rumpdefs.h:1.15
--- src/sys/rump/include/rump/rumpdefs.h:1.14	Sun Nov 18 19:25:25 2012
+++ src/sys/rump/include/rump/rumpdefs.h	Sun Nov 18 21:20:16 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.14 2012/11/18 19:25:25 pooka Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.15 2012/11/18 21:20:16 pooka Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -8,7 +8,11 @@
 #define _RUMP_RUMPDEFS_H_
 
 #include 
-#include 
+#ifdef _KERNEL
+#include 
+#else
+#include 
+#endif
 
 struct rump_sockaddr_in {
 	uint8_t		sin_len;

CVS commit: src/sys/rump/include/rump

2012-11-18 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sun Nov 18 21:19:53 UTC 2012

Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh

Log Message:
Necessary _KERNEL wrap to previous.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/sys/rump/include/rump/makerumpdefs.sh:1.11
--- src/sys/rump/include/rump/makerumpdefs.sh:1.10	Sun Nov 18 19:25:09 2012
+++ src/sys/rump/include/rump/makerumpdefs.sh	Sun Nov 18 21:19:52 2012
@@ -8,12 +8,16 @@ echo Generating rumpdefs.h
 rm -f rumpdefs.h
 exec > rumpdefs.h
 
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.10 2012/11/18 19:25:09 pooka Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.11 2012/11/18 21:19:52 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'
 printf '#include \n'
-printf '#include \n'
+printf '#ifdef _KERNEL\n'
+printf '#include \n'
+printf '#else\n'
+printf '#include \n'
+printf '#endif\n'
 
 fromvers () {
 	echo

CVS commit: src/sys/rump/include/rump

2012-11-18 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sun Nov 18 19:25:25 UTC 2012

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/sys/rump/include/rump/rumpdefs.h:1.14
--- src/sys/rump/include/rump/rumpdefs.h:1.13	Sun Nov 18 19:04:32 2012
+++ src/sys/rump/include/rump/rumpdefs.h	Sun Nov 18 19:25:25 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.13 2012/11/18 19:04:32 pooka Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.14 2012/11/18 19:25:25 pooka Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -8,7 +8,7 @@
 #define _RUMP_RUMPDEFS_H_
 
 #include 
-#include 
+#include 
 
 struct rump_sockaddr_in {
 	uint8_t		sin_len;

CVS commit: src/sys/rump/include/rump

2012-11-18 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sun Nov 18 19:25:10 UTC 2012

Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh

Log Message:
make work for non-c++ (???)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/sys/rump/include/rump/makerumpdefs.sh:1.10
--- src/sys/rump/include/rump/makerumpdefs.sh:1.9	Sun Nov 18 19:03:43 2012
+++ src/sys/rump/include/rump/makerumpdefs.sh	Sun Nov 18 19:25:09 2012
@@ -8,12 +8,12 @@ echo Generating rumpdefs.h
 rm -f rumpdefs.h
 exec > rumpdefs.h
 
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.9 2012/11/18 19:03:43 pooka Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.10 2012/11/18 19:25:09 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'
 printf '#include \n'
-printf '#include \n'
+printf '#include \n'
 
 fromvers () {
 	echo

CVS commit: src/sys/rump/include/rump

2012-11-18 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sun Nov 18 19:04:32 UTC 2012

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 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.12 src/sys/rump/include/rump/rumpdefs.h:1.13
--- src/sys/rump/include/rump/rumpdefs.h:1.12	Sun Nov 18 18:40:05 2012
+++ src/sys/rump/include/rump/rumpdefs.h	Sun Nov 18 19:04:32 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.12 2012/11/18 18:40:05 pooka Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.13 2012/11/18 19:04:32 pooka Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -52,9 +52,109 @@ enum rump_vtype	{ RUMP_VNON, RUMP_VREG, 
 #define	RUMP_LK_RETRY	0x0002	
 
 /*	NetBSD: errno.h,v 1.39 2006/10/31 00:38:07 cbiere Exp 	*/
-#ifndef EJUSTRETURN
-#define	EJUSTRETURN	-2		/* don't modify regs, just return */
-#endif /* EJUSTRETURN */
+#define	RUMP_EPERM		1		/* Operation not permitted */
+#define	RUMP_ENOENT		2		/* No such file or directory */
+#define	RUMP_ESRCH		3		/* No such process */
+#define	RUMP_EINTR		4		/* Interrupted system call */
+#define	RUMP_EIO		5		/* Input/output error */
+#define	RUMP_ENXIO		6		/* Device not configured */
+#define	RUMP_E2BIG		7		/* Argument list too long */
+#define	RUMP_ENOEXEC		8		/* Exec format error */
+#define	RUMP_EBADF		9		/* Bad file descriptor */
+#define	RUMP_ECHILD		10		/* No child processes */
+#define	RUMP_EDEADLK		11		/* Resource deadlock avoided */
+#define	RUMP_ENOMEM		12		/* Cannot allocate memory */
+#define	RUMP_EACCES		13		/* Permission denied */
+#define	RUMP_EFAULT		14		/* Bad address */
+#define	RUMP_ENOTBLK		15		/* Block device required */
+#define	RUMP_EBUSY		16		/* Device busy */
+#define	RUMP_EEXIST		17		/* File exists */
+#define	RUMP_EXDEV		18		/* Cross-device link */
+#define	RUMP_ENODEV		19		/* Operation not supported by device */
+#define	RUMP_ENOTDIR		20		/* Not a directory */
+#define	RUMP_EISDIR		21		/* Is a directory */
+#define	RUMP_EINVAL		22		/* Invalid argument */
+#define	RUMP_ENFILE		23		/* Too many open files in system */
+#define	RUMP_EMFILE		24		/* Too many open files */
+#define	RUMP_ENOTTY		25		/* Inappropriate ioctl for device */
+#define	RUMP_ETXTBSY		26		/* Text file busy */
+#define	RUMP_EFBIG		27		/* File too large */
+#define	RUMP_ENOSPC		28		/* No space left on device */
+#define	RUMP_ESPIPE		29		/* Illegal seek */
+#define	RUMP_EROFS		30		/* Read-only file system */
+#define	RUMP_EMLINK		31		/* Too many links */
+#define	RUMP_EPIPE		32		/* Broken pipe */
+#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_EINPROGRESS	36		/* Operation now in progress */
+#define	RUMP_EALREADY	37		/* Operation already in progress */
+#define	RUMP_ENOTSOCK	38		/* Socket operation on non-socket */
+#define	RUMP_EDESTADDRREQ	39		/* Destination address required */
+#define	RUMP_EMSGSIZE	40		/* Message too long */
+#define	RUMP_EPROTOTYPE	41		/* Protocol wrong type for socket */
+#define	RUMP_ENOPROTOOPT	42		/* Protocol option not available */
+#define	RUMP_EPROTONOSUPPORT	43		/* Protocol not supported */
+#define	RUMP_ESOCKTNOSUPPORT	44		/* Socket type not supported */
+#define	RUMP_EOPNOTSUPP	45		/* Operation not supported */
+#define	RUMP_EPFNOSUPPORT	46		/* Protocol family not supported */
+#define	RUMP_EAFNOSUPPORT	47		/* Address family not supported by protocol family */
+#define	RUMP_EADDRINUSE	48		/* Address already in use */
+#define	RUMP_EADDRNOTAVAIL	49		/* Can't assign requested address */
+#define	RUMP_ENETDOWN	50		/* Network is down */
+#define	RUMP_ENETUNREACH	51		/* Network is unreachable */
+#define	RUMP_ENETRESET	52		/* Network dropped connection on reset */
+#define	RUMP_ECONNABORTED	53		/* Software caused connection abort */
+#define	RUMP_ECONNRESET	54		/* Connection reset by peer */
+#define	RUMP_ENOBUFS		55		/* No buffer space available */
+#define	RUMP_EISCONN		56		/* Socket is already connected */
+#define	RUMP_ENOTCONN	57		/* Socket is not connected */
+#define	RUMP_ESHUTDOWN	58		/* Can't send after socket shutdown */
+#define	RUMP_ETOOMANYREFS	59		/* Too many references: can't splice */
+#define	RUMP_ETIMEDOUT	60		/* Operation timed out */
+#define	RUMP_ECONNREFUSED	61		/* Connection refused */
+#define	RUMP_ELOOP		62		/* Too many levels of symbolic links */
+#define	RUMP_ENAMETOOLONG	63		/* File name too long */
+#define	RUMP_EHOSTDOWN	64		/* Host is down */
+#define	RUMP_EHOSTUNREACH	65		/* No route to host */
+#define	RUMP_ENOTEMPTY	66		/* Directory not empty */
+#define	RUMP_EPROCLIM	67		/* Too many processes */
+#d

CVS commit: src/sys/rump/include/rump

2012-11-18 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sun Nov 18 19:03:43 UTC 2012

Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh

Log Message:
While mucking in here, give the [local] client a chance to access all
rump kernel (i.e. NetBSD) errnos, not just EJUSTRETURN.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.8 src/sys/rump/include/rump/makerumpdefs.sh:1.9
--- src/sys/rump/include/rump/makerumpdefs.sh:1.8	Sun Nov 18 18:39:23 2012
+++ src/sys/rump/include/rump/makerumpdefs.sh	Sun Nov 18 19:03:43 2012
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
 rm -f rumpdefs.h
 exec > rumpdefs.h
 
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.8 2012/11/18 18:39:23 pooka Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.9 2012/11/18 19:03:43 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'
@@ -46,9 +46,7 @@ sed -n '/#define.*LK_[A-Z]/s/LK_/RUMP_LK
 | sed 's,/\*.*$,,'
 
 fromvers ../../../sys/errno.h
-printf '#ifndef EJUSTRETURN\n'
-sed -n '/EJUSTRETURN/p'	< ../../../sys/errno.h
-printf '#endif /* EJUSTRETURN */\n'
+sed -n '/#define[ 	]*E/s/E[A-Z]*/RUMP_&/p' < ../../../sys/errno.h
 
 fromvers ../../../sys/reboot.h
 sed -n '/#define.*RB_[A-Z]/s/RB_/RUMP_RB_/gp' <../../../sys/reboot.h	\

CVS commit: src/sys/rump/include/rump

2012-11-18 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sun Nov 18 18:40:06 UTC 2012

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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.11 src/sys/rump/include/rump/rumpdefs.h:1.12
--- src/sys/rump/include/rump/rumpdefs.h:1.11	Fri Jul 20 09:03:09 2012
+++ src/sys/rump/include/rump/rumpdefs.h	Sun Nov 18 18:40:05 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.11 2012/07/20 09:03:09 pooka Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.12 2012/11/18 18:40:05 pooka Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -8,6 +8,7 @@
 #define _RUMP_RUMPDEFS_H_
 
 #include 
+#include 
 
 struct rump_sockaddr_in {
 	uint8_t		sin_len;
@@ -43,11 +44,8 @@ struct rump_sockaddr_in {
 #define	RUMP_O_SEARCH	0x0080	/* skip search permission checks */
 #define	RUMP_O_NOSIGPIPE	0x0100	/* don't deliver sigpipe */
 
-/*	NetBSD: vnode.h,v 1.236 2011/11/24 15:51:30 ahoka Exp 	*/
-#ifndef __VTYPE_DEFINED
-#define __VTYPE_DEFINED
-enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD };
-#endif /* __VTYPE_DEFINED */
+/*	NetBSD: vnode.h,v 1.237 2012/11/18 18:39:24 pooka 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	
 #define	RUMP_LK_NOWAIT	0x0010

CVS commit: src/sys/rump/include/rump

2012-08-08 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Aug  8 13:58:56 UTC 2012

Modified Files:
src/sys/rump/include/rump: Makefile

Log Message:
don't install includes if MKRUMP = no


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/rump/Makefile

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/Makefile
diff -u src/sys/rump/include/rump/Makefile:1.4 src/sys/rump/include/rump/Makefile:1.5
--- src/sys/rump/include/rump/Makefile:1.4	Tue Aug 24 09:19:04 2010
+++ src/sys/rump/include/rump/Makefile	Wed Aug  8 09:58:56 2012
@@ -1,12 +1,16 @@
-#	$NetBSD: Makefile,v 1.4 2010/08/24 13:19:04 pooka Exp $
+#	$NetBSD: Makefile,v 1.5 2012/08/08 13:58:56 christos Exp $
+
+.include 
 
 INCSDIR=	/usr/include/rump
 
+.if (${MKRUMP} != "no")
 INCS=		rump.h rump_namei.h rump_syscalls.h rump_syscalls_compat.h
 INCS+=		rumpdefs.h rumpuser.h rumpvnode_if.h
 
 INCS+=		rumpkern_if_pub.h rumpvfs_if_pub.h rumpnet_if_pub.h
 
 INCS+=		scsitest.h
+.endif
 
 .include

CVS commit: src/sys/rump/include/rump

2012-07-20 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Fri Jul 20 09:27:12 UTC 2012

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
Revert rev 1.51.  Turns out the defines are still useful when you really
want a local client.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 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.53 src/sys/rump/include/rump/rump.h:1.54
--- src/sys/rump/include/rump/rump.h:1.53	Mon Mar 21 16:41:08 2011
+++ src/sys/rump/include/rump/rump.h	Fri Jul 20 09:27:11 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.53 2011/03/21 16:41:08 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.54 2012/07/20 09:27:11 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -145,31 +145,59 @@ _END_DECLS
 #endif /* RUMP_SYS_NETWORKING */
 
 #ifdef RUMP_SYS_IOCTL
-#error deprecated syscall selection.  use rumphijack
+#define ioctl(...) rump_sys_ioctl(__VA_ARGS__)
+#define fnctl(...) rump_sys_fcntl(__VA_ARGS__)
 #endif /* RUMP_SYS_IOCTL */
 
 #ifdef RUMP_SYS_CLOSE
-#error deprecated syscall selection.  use rumphijack
+#define close(a) rump_sys_close(a)
 #endif /* RUMP_SYS_CLOSE */
 
 #ifdef RUMP_SYS_OPEN
-#error deprecated syscall selection.  use rumphijack
+#define open(...) rump_sys_open(__VA_ARGS__)
 #endif /* RUMP_SYS_OPEN */
 
 #ifdef RUMP_SYS_READWRITE
-#error deprecated syscall selection.  use rumphijack
+#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)
+#define preadv(a,b,c,d) rump_sys_preadv(a,b,c,d)
+#define write(a,b,c) rump_sys_write(a,b,c)
+#define writev(a,b,c) rump_sys_writev(a,b,c)
+#define pwrite(a,b,c,d) rump_sys_pwrite(a,b,c,d)
+#define pwritev(a,b,c,d) rump_sys_pwritev(a,b,c,d)
 #endif /* RUMP_SYS_READWRITE */
 
 #ifdef RUMP_SYS_FILEOPS
-#error deprecated syscall selection.  use rumphijack
+#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)
+#define symlink(a,b) rump_sys_symlink(a,b)
+#define unlink(a) rump_sys_unlink(a)
+#define readlink(a,b,c) rump_sys_readlink(a,b,c)
+#define chdir(a) rump_sys_chdir(a)
+#define fsync(a) rump_sys_fsync(a)
+#define sync() rump_sys_sync()
+#define chown(a,b,c) rump_sys_chown(a,b,c)
+#define fchown(a,b,c) rump_sys_fchown(a,b,c)
+#define lchown(a,b,c) rump_sys_lchown(a,b,c)
+#define lseek(a,b,c) rump_sys_lseek(a,b,c)
+#define mknod(a,b,c) rump_sys_mknod(a,b,c)
+#define rename(a,b) rump_sys_rename(a,b)
+#define truncate(a,b) rump_sys_truncate(a,b)
+#define ftruncate(a,b) rump_sys_ftruncate(a,b)
+#define umask(a) rump_sys_umask(a)
+#define getdents(a,b,c) rump_sys_getdents(a,b,c)
 #endif /* RUMP_SYS_FILEOPS */
 
 #ifdef RUMP_SYS_STAT
-#error deprecated syscall selection.  use rumphijack
+#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
-#error deprecated syscall selection.  use rumphijack
+#define getpid() rump_sys_getpid()
 #endif /* RUMP_SYS_PROCOPS */
 
 #endif /* _RUMP_RUMP_H_ */

CVS commit: src/sys/rump/include/rump

2012-07-20 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Fri Jul 20 09:10:23 UTC 2012

Modified Files:
src/sys/rump/include/rump: rump_syscalls_compat.h

Log Message:
add simple compat for other OSs to be able to use rump_syscalls.h


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/sys/rump/include/rump/rump_syscalls_compat.h:1.8
--- src/sys/rump/include/rump/rump_syscalls_compat.h:1.7	Mon Jan 17 18:24:17 2011
+++ src/sys/rump/include/rump/rump_syscalls_compat.h	Fri Jul 20 09:10:23 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_syscalls_compat.h,v 1.7 2011/01/17 18:24:17 pooka Exp $	*/
+/*	$NetBSD: rump_syscalls_compat.h,v 1.8 2012/07/20 09:10:23 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -28,8 +28,8 @@
 #ifndef _RUMP_RUMP_SYSCALLS_COMPAT_H_
 #define _RUMP_RUMP_SYSCALLS_COMPAT_H_
 
-#ifndef _KERNEL
 #ifdef __NetBSD__
+#include 
 #include 
 
 /* time_t change */
@@ -51,7 +51,13 @@
 #define RUMP_SYS_RENAME_FHSTAT rump___sysimpl_fhstat40
 #endif /* __NetBSD_Prereq(5,99,7) */
 
+#else /* !__NetBSD__ */
+
+#ifndef __RENAME
+#define __RUMPSTRINGIFY(x) #x
+#define __RENAME(x) __asm(__RUMPSTRINGIFY(x))
+#endif /* __RENAME */
+
 #endif /* __NetBSD__ */
-#endif /* _KERNEL */
 
 #endif /* _RUMP_RUMP_SYSCALLS_COMPAT_H_ */

CVS commit: src/sys/rump/include/rump

2012-07-20 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Fri Jul 20 09:03:09 UTC 2012

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/sys/rump/include/rump/rumpdefs.h:1.11
--- src/sys/rump/include/rump/rumpdefs.h:1.10	Tue Feb  1 21:21:34 2011
+++ src/sys/rump/include/rump/rumpdefs.h	Fri Jul 20 09:03:09 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.10 2011/02/01 21:21:34 pooka Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.11 2012/07/20 09:03:09 pooka Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -9,7 +9,17 @@
 
 #include 
 
-/*	NetBSD: fcntl.h,v 1.36 2010/09/21 19:26:18 chs Exp 	*/
+struct rump_sockaddr_in {
+	uint8_t		sin_len;
+	uint8_t		sin_family;
+	uint16_t	sin_port;
+	struct {
+			uint32_t s_addr;
+	} sin_addr;
+	int8_t		sin_zero[8];
+};
+
+/*	NetBSD: fcntl.h,v 1.42 2012/01/25 00:28:35 christos 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 */
@@ -29,8 +39,11 @@
 #define	RUMP_O_RSYNC		0x0002	/* read: I/O completion as for write */
 #define	RUMP_O_DIRECT	0x0008	/* direct I/O hint */
 #define	RUMP_O_DIRECTORY	0x0020	/* fail if not a directory */
+#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 */
 
-/*	NetBSD: vnode.h,v 1.223 2010/07/28 11:03:47 hannken Exp 	*/
+/*	NetBSD: vnode.h,v 1.236 2011/11/24 15:51:30 ahoka Exp 	*/
 #ifndef __VTYPE_DEFINED
 #define __VTYPE_DEFINED
 enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD };
@@ -70,4 +83,110 @@ enum vtype	{ VNON, VREG, VDIR, VBLK, VCH
 #define	RUMP_AB_SILENT	0x0004	
 #define	RUMP_AB_DEBUG	0x0008	
 
+/*	NetBSD: socket.h,v 1.107 2012/06/22 18:26:35 christos 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_CLOEXEC	0x1000	
+#define	RUMP_SOCK_NONBLOCK	0x2000	
+#define	RUMP_SOCK_NOSIGPIPE	0x4000	
+#define	RUMP_SOCK_FLAGS_MASK	0xf000	
+#define	RUMP_AF_UNSPEC	0		
+#define	RUMP_AF_LOCAL	1		
+#define	RUMP_AF_UNIX		RUMP_AF_LOCAL	
+#define	RUMP_AF_INET		2		
+#define	RUMP_AF_IMPLINK	3		
+#define	RUMP_AF_PUP		4		
+#define	RUMP_AF_CHAOS	5		
+#define	RUMP_AF_NS		6		
+#define	RUMP_AF_ISO		7		
+#define	RUMP_AF_OSI		RUMP_AF_ISO
+#define	RUMP_AF_ECMA		8		
+#define	RUMP_AF_DATAKIT	9		
+#define	RUMP_AF_CCITT	10		
+#define	RUMP_AF_SNA		11		
+#define RUMP_AF_DECnet	12		
+#define RUMP_AF_DLI		13		
+#define RUMP_AF_LAT		14		
+#define	RUMP_AF_HYLINK	15		
+#define	RUMP_AF_APPLETALK	16		
+#define	RUMP_AF_OROUTE	17		
+#define	RUMP_AF_LINK		18		
+#define	RUMP_AF_COIP		20		
+#define	RUMP_AF_CNT		21		
+#define	RUMP_AF_IPX		23		
+#define	RUMP_AF_INET6	24		
+#define RUMP_AF_ISDN		26		
+#define RUMP_AF_E164		RUMP_AF_ISDN		
+#define RUMP_AF_NATM		27		
+#define RUMP_AF_ARP		28		
+#define RUMP_AF_BLUETOOTH	31		
+#define	RUMP_AF_IEEE80211	32		
+#define	RUMP_AF_MPLS		33		
+#define	RUMP_AF_ROUTE	34		
+#define	RUMP_AF_MAX		35
+#define	RUMP_PF_UNSPEC	RUMP_AF_UNSPEC
+#define	RUMP_PF_LOCAL	RUMP_AF_LOCAL
+#define	RUMP_PF_UNIX		RUMP_PF_LOCAL	
+#define	RUMP_PF_INET		RUMP_AF_INET
+#define	RUMP_PF_IMPLINK	RUMP_AF_IMPLINK
+#define	RUMP_PF_PUP		RUMP_AF_PUP
+#define	RUMP_PF_CHAOS	RUMP_AF_CHAOS
+#define	RUMP_PF_NS		RUMP_AF_NS
+#define	RUMP_PF_ISO		RUMP_AF_ISO
+#define	RUMP_PF_OSI		RUMP_AF_ISO
+#define	RUMP_PF_ECMA		RUMP_AF_ECMA
+#define	RUMP_PF_DATAKIT	RUMP_AF_DATAKIT
+#define	RUMP_PF_CCITT	RUMP_AF_CCITT
+#define	RUMP_PF_SNA		RUMP_AF_SNA
+#define RUMP_PF_DECnet	RUMP_AF_DECnet
+#define RUMP_PF_DLI		RUMP_AF_DLI
+#define RUMP_PF_LAT		RUMP_AF_LAT
+#define	RUMP_PF_HYLINK	RUMP_AF_HYLINK
+#define	RUMP_PF_APPLETALK	RUMP_AF_APPLETALK
+#define	RUMP_PF_OROUTE	RUMP_AF_OROUTE
+#define	RUMP_PF_LINK		RUMP_AF_LINK
+#define	RUMP_PF_XTP		pseudo_RUMP_AF_XTP	
+#define	RUMP_PF_COIP		RUMP_AF_COIP
+#define	RUMP_PF_CNT		RUMP_AF_CNT
+#define	RUMP_PF_INET6	RUMP_AF_INET6
+#define	RUMP_PF_IPX		RUMP_AF_IPX		
+#define RUMP_PF_RTIP		pseudo_RUMP_AF_RTIP	
+#define RUMP_PF_PIP		pseudo_RUMP_AF_PIP
+#define RUMP_PF_ISDN		RUMP_AF_ISDN		
+#define RUMP_PF_E164		RUMP_AF_E164
+#define RUMP_PF_NATM		RUMP_AF_NATM
+#define RUMP_PF_ARP		RUMP_AF_ARP
+#define RUMP_PF_KEY 		pseudo_RUMP_AF_KEY	
+#define RUMP_PF_BLUETOOTH	RUMP_AF_BLUETOOTH
+#define	RUMP_PF_MPLS		RUMP_AF_MPLS
+#define	RUMP_PF_ROUTE	RUMP_AF_ROUTE
+#define	RUMP_PF_MAX		RUMP_AF_MAX
+#define	RUMP_SO_DEBUG	0x0001		
+#define	RUMP_SO_ACCEPTCONN	0x0002		
+#define	RUMP_SO_R

CVS commit: src/sys/rump/include/rump

2012-07-20 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Fri Jul 20 09:02:48 UTC 2012

Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh

Log Message:
add some network-related compat defs


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/sys/rump/include/rump/makerumpdefs.sh:1.7
--- src/sys/rump/include/rump/makerumpdefs.sh:1.6	Fri Jul  2 10:44:26 2010
+++ src/sys/rump/include/rump/makerumpdefs.sh	Fri Jul 20 09:02:48 2012
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
 rm -f rumpdefs.h
 exec > rumpdefs.h
 
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.6 2010/07/02 10:44:26 hannken Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.7 2012/07/20 09:02: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'
@@ -19,6 +19,22 @@ fromvers () {
 	sed -n '1{s/\$//gp;q;}' $1
 }
 
+# Odds of sockaddr_in changing are zero, so no acrobatics needed.  Alas,
+# dealing with in_addr_t for s_addr is very difficult, so have it as
+# an incompatible uint32_t for now.
+echo
+cat <

CVS commit: src/sys/rump/include/rump

2011-05-23 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Mon May 23 20:49:35 UTC 2011

Modified Files:
src/sys/rump/include/rump: rumpuser.h

Log Message:
Mark rumpuser_exit and rumpuser_thread_exit as dead.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 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.68 src/sys/rump/include/rump/rumpuser.h:1.69
--- src/sys/rump/include/rump/rumpuser.h:1.68	Mon Mar 21 16:41:08 2011
+++ src/sys/rump/include/rump/rumpuser.h	Mon May 23 20:49:35 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.68 2011/03/21 16:41:08 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.69 2011/05/23 20:49:35 joerg Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -102,7 +102,7 @@
 int rumpuser_kill(int64_t, int, int *);
 
 #define RUMPUSER_PANIC (-1)
-void rumpuser_exit(int);
+void rumpuser_exit(int) __dead;
 void rumpuser_seterrno(int);
 
 int rumpuser_writewatchfile_setup(int, int, intptr_t, int *);
@@ -118,7 +118,7 @@
 
 int  rumpuser_thread_create(void *(*f)(void *), void *, const char *, int,
 			void **);
-void rumpuser_thread_exit(void);
+void rumpuser_thread_exit(void) __dead;
 int  rumpuser_thread_join(void *);
 
 struct rumpuser_mtx;

CVS commit: src/sys/rump/include/rump

2011-03-09 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Mar  9 10:10:19 UTC 2011

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
Duh, the nfsd hacks in tests still used RUMP_SYS_NETWORKING.  It
appears that using nxr to search for users wasn't a very good idea.
Put networking back and make the test of the defines give out
#errors.

me be fixink this


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 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.51 src/sys/rump/include/rump/rump.h:1.52
--- src/sys/rump/include/rump/rump.h:1.51	Tue Mar  8 18:35:10 2011
+++ src/sys/rump/include/rump/rump.h	Wed Mar  9 10:10:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.51 2011/03/08 18:35:10 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.52 2011/03/09 10:10:19 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -125,4 +125,53 @@
 _END_DECLS
 #endif
 
+/*
+ * Begin rump syscall conditionals.  Yes, something a little better
+ * is required here.
+ */
+#ifdef RUMP_SYS_NETWORKING
+#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)
+#define connect(a,b,c) rump_sys_connect(a,b,c)
+#define getpeername(a,b,c) rump_sys_getpeername(a,b,c)
+#define getsockname(a,b,c) rump_sys_getsockname(a,b,c)
+#define listen(a,b) rump_sys_listen(a,b)
+#define recvfrom(a,b,c,d,e,f) rump_sys_recvfrom(a,b,c,d,e,f)
+#define recvmsg(a,b,c) rump_sys_recvmsg(a,b,c)
+#define sendto(a,b,c,d,e,f) rump_sys_sendto(a,b,c,d,e,f)
+#define sendmsg(a,b,c) rump_sys_sendmsg(a,b,c)
+#define getsockopt(a,b,c,d,e) rump_sys_getsockopt(a,b,c,d,e)
+#define setsockopt(a,b,c,d,e) rump_sys_setsockopt(a,b,c,d,e)
+#define shutdown(a,b) rump_sys_shutdown(a,b)
+#endif /* RUMP_SYS_NETWORKING */
+
+#ifdef RUMP_SYS_IOCTL
+#error deprecated syscall selection.  use rumphijack
+#endif /* RUMP_SYS_IOCTL */
+
+#ifdef RUMP_SYS_CLOSE
+#error deprecated syscall selection.  use rumphijack
+#endif /* RUMP_SYS_CLOSE */
+
+#ifdef RUMP_SYS_OPEN
+#error deprecated syscall selection.  use rumphijack
+#endif /* RUMP_SYS_OPEN */
+
+#ifdef RUMP_SYS_READWRITE
+#error deprecated syscall selection.  use rumphijack
+#endif /* RUMP_SYS_READWRITE */
+
+#ifdef RUMP_SYS_FILEOPS
+#error deprecated syscall selection.  use rumphijack
+#endif /* RUMP_SYS_FILEOPS */
+
+#ifdef RUMP_SYS_STAT
+#error deprecated syscall selection.  use rumphijack
+#endif /* RUMP_SYS_STAT */
+
+#ifdef RUMP_SYS_PROCOPS
+#error deprecated syscall selection.  use rumphijack
+#endif /* RUMP_SYS_PROCOPS */
+
 #endif /* _RUMP_RUMP_H_ */

CVS commit: src/sys/rump/include/rump

2011-03-08 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue Mar  8 18:35:10 UTC 2011

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
g/c old-style syscall selection method


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 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.50 src/sys/rump/include/rump/rump.h:1.51
--- src/sys/rump/include/rump/rump.h:1.50	Sun Jan  2 12:52:25 2011
+++ src/sys/rump/include/rump/rump.h	Tue Mar  8 18:35:10 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.50 2011/01/02 12:52:25 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.51 2011/03/08 18:35:10 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -125,81 +125,4 @@
 _END_DECLS
 #endif
 
-/*
- * Begin rump syscall conditionals.  Yes, something a little better
- * is required here.
- */
-#ifdef RUMP_SYS_NETWORKING
-#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)
-#define connect(a,b,c) rump_sys_connect(a,b,c)
-#define getpeername(a,b,c) rump_sys_getpeername(a,b,c)
-#define getsockname(a,b,c) rump_sys_getsockname(a,b,c)
-#define listen(a,b) rump_sys_listen(a,b)
-#define recvfrom(a,b,c,d,e,f) rump_sys_recvfrom(a,b,c,d,e,f)
-#define recvmsg(a,b,c) rump_sys_recvmsg(a,b,c)
-#define sendto(a,b,c,d,e,f) rump_sys_sendto(a,b,c,d,e,f)
-#define sendmsg(a,b,c) rump_sys_sendmsg(a,b,c)
-#define getsockopt(a,b,c,d,e) rump_sys_getsockopt(a,b,c,d,e)
-#define setsockopt(a,b,c,d,e) rump_sys_setsockopt(a,b,c,d,e)
-#define shutdown(a,b) rump_sys_shutdown(a,b)
-#endif /* RUMP_SYS_NETWORKING */
-
-#ifdef RUMP_SYS_IOCTL
-#define ioctl(...) rump_sys_ioctl(__VA_ARGS__)
-#define fnctl(...) rump_sys_fcntl(__VA_ARGS__)
-#endif /* RUMP_SYS_IOCTL */
-
-#ifdef RUMP_SYS_CLOSE
-#define close(a) rump_sys_close(a)
-#endif /* RUMP_SYS_CLOSE */
-
-#ifdef RUMP_SYS_OPEN
-#define open(...) rump_sys_open(__VA_ARGS__)
-#endif /* RUMP_SYS_OPEN */
-
-#ifdef RUMP_SYS_READWRITE
-#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)
-#define preadv(a,b,c,d) rump_sys_preadv(a,b,c,d)
-#define write(a,b,c) rump_sys_write(a,b,c)
-#define writev(a,b,c) rump_sys_writev(a,b,c)
-#define pwrite(a,b,c,d) rump_sys_pwrite(a,b,c,d)
-#define pwritev(a,b,c,d) rump_sys_pwritev(a,b,c,d)
-#endif /* RUMP_SYS_READWRITE */
-
-#ifdef RUMP_SYS_FILEOPS
-#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)
-#define symlink(a,b) rump_sys_symlink(a,b)
-#define unlink(a) rump_sys_unlink(a)
-#define readlink(a,b,c) rump_sys_readlink(a,b,c)
-#define chdir(a) rump_sys_chdir(a)
-#define fsync(a) rump_sys_fsync(a)
-#define sync() rump_sys_sync()
-#define chown(a,b,c) rump_sys_chown(a,b,c)
-#define fchown(a,b,c) rump_sys_fchown(a,b,c)
-#define lchown(a,b,c) rump_sys_lchown(a,b,c)
-#define lseek(a,b,c) rump_sys_lseek(a,b,c)
-#define mknod(a,b,c) rump_sys_mknod(a,b,c)
-#define rename(a,b) rump_sys_rename(a,b)
-#define truncate(a,b) rump_sys_truncate(a,b)
-#define ftruncate(a,b) rump_sys_ftruncate(a,b)
-#define umask(a) rump_sys_umask(a)
-#define getdents(a,b,c) rump_sys_getdents(a,b,c)
-#endif /* RUMP_SYS_FILEOPS */
-
-#ifdef RUMP_SYS_STAT
-#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
-#define getpid() rump_sys_getpid()
-#endif /* RUMP_SYS_PROCOPS */
-
 #endif /* _RUMP_RUMP_H_ */

CVS commit: src/sys/rump/include/rump

2011-02-01 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue Feb  1 21:21:34 UTC 2011

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
regen for O_DIRECTORY


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/sys/rump/include/rump/rumpdefs.h:1.10
--- src/sys/rump/include/rump/rumpdefs.h:1.9	Wed Jul 28 09:32:13 2010
+++ src/sys/rump/include/rump/rumpdefs.h	Tue Feb  1 21:21:34 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.9 2010/07/28 09:32:13 hannken Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.10 2011/02/01 21:21:34 pooka Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -9,7 +9,7 @@
 
 #include 
 
-/*	NetBSD: fcntl.h,v 1.35 2009/03/11 06:05:29 mrg Exp 	*/
+/*	NetBSD: fcntl.h,v 1.36 2010/09/21 19:26:18 chs 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 */
@@ -24,12 +24,13 @@
 #define	RUMP_O_CREAT		0x0200	/* create if nonexistent */
 #define	RUMP_O_TRUNC		0x0400	/* truncate to zero length */
 #define	RUMP_O_EXCL		0x0800	/* error if already exists */
+#define	RUMP_O_NOCTTY	0x8000	/* don't assign controlling terminal */
 #define	RUMP_O_DSYNC		0x0001	/* write: I/O data completion */
 #define	RUMP_O_RSYNC		0x0002	/* read: I/O completion as for write */
 #define	RUMP_O_DIRECT	0x0008	/* direct I/O hint */
-#define	RUMP_O_NOCTTY	0x8000	/* don't assign controlling terminal */
+#define	RUMP_O_DIRECTORY	0x0020	/* fail if not a directory */
 
-/*	NetBSD: vnode.h,v 1.222 2010/07/28 09:31:00 hannken Exp 	*/
+/*	NetBSD: vnode.h,v 1.223 2010/07/28 11:03:47 hannken Exp 	*/
 #ifndef __VTYPE_DEFINED
 #define __VTYPE_DEFINED
 enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD };

CVS commit: src/sys/rump/include/rump

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 16:25:39 UTC 2011

Modified Files:
src/sys/rump/include/rump: rump_syscalls_compat.h

Log Message:
use newstyle rump syscall compat


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/sys/rump/include/rump/rump_syscalls_compat.h:1.6
--- src/sys/rump/include/rump/rump_syscalls_compat.h:1.5	Tue Jan  4 17:00:19 2011
+++ src/sys/rump/include/rump/rump_syscalls_compat.h	Mon Jan 17 16:25:39 2011
@@ -1,7 +1,7 @@
-/*	$NetBSD: rump_syscalls_compat.h,v 1.5 2011/01/04 17:00:19 pooka Exp $	*/
+/*	$NetBSD: rump_syscalls_compat.h,v 1.6 2011/01/17 16:25:39 pooka Exp $	*/
 
 /*-
- * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,48 +29,26 @@
 #define _RUMP_RUMP_SYSCALLS_COMPAT_H_
 
 #ifndef _KERNEL
-/*
- * Compat calls.  They're manual now.  Note the slightly non-standard
- * naming.  This is because we cannot exploit __RENAME() the same way
- * normal builds exploit it -- we want to build *new* files linked
- * against these symbols.  Note that the defines don't allow calling
- * the current ones from a old userland, should that be desired for
- * whatever reason.  
- */
 #ifdef __NetBSD__
 #include 
+
+/* time_t change */
 #if !__NetBSD_Prereq__(5,99,7)
-#define rump_sys_stat(a,b) rump_sys_nb5_stat(a,b)
-#define rump_sys_lstat(a,b) rump_sys_nb5_lstat(a,b)
-#define rump_sys_fstat(a,b) rump_sys_nb5_fstat(a,b)
-#define rump_sys_pollts(a,b,c,d) rump_sys_nb5_pollts(a,b,c,d)
-#define rump_sys_select(a,b,c,d,e) rump_sys_nb5_select(a,b,c,d,e)
-#define rump_sys_utimes(a,b) rump_sys_nb5_utimes(a,b)
-#define rump_sys_lutimes(a,b) rump_sys_nb5_lutimes(a,b)
-#define rump_sys_futimes(a,b) rump_sys_nb5_futimes(a,b)
-#endif /* __NetBSD_Prereq */
+#define RUMP_SYS_RENAME_STAT rump___sysimpl_stat30
+#define RUMP_SYS_RENAME_FSTAT rump___sysimpl_fstat30
+#define RUMP_SYS_RENAME_LSTAT rump___sysimpl_lstat30
+
+#define RUMP_SYS_RENAME_POLLTS rump___sysimpl_pollts
+#define RUMP_SYS_RENAME_SELECT rump___sysimpl_select
+#define RUMP_SYS_RENAME_PSELECT rump___sysimpl_pselect
+#define RUMP_SYS_RENAME_KEVENT rump___sysimpl_kevent
+
+#define RUMP_SYS_RENAME_UTIMES rump___sysimpl_utimes
+#define RUMP_SYS_RENAME_FUTIMES rump___sysimpl_futimes
+#define RUMP_SYS_RENAME_LUTIMES rump___sysimpl_lutimes
+#endif /* __NetBSD_Prereq(5,99,7) */
+
 #endif /* __NetBSD__ */
 #endif /* _KERNEL */
 
-#ifdef _BEGIN_DECLS
-_BEGIN_DECLS  
-#endif
-
-struct stat;
-struct pollfd;
-struct timespec;
-int rump_sys_nb5_stat(const char *, struct stat *);
-int rump_sys_nb5_lstat(const char *, struct stat *);
-int rump_sys_nb5_fstat(int, struct stat *);
-int rump_sys_nb5_pollts(struct pollfd *, size_t,
-			const struct timespec *, const void *);
-int rump_sys_nb5_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-int rump_sys_nb5_utimes(const char *, const struct timeval *);
-int rump_sys_nb5_lutimes(const char *, const struct timeval *);
-int rump_sys_nb5_futimes(int, const struct timeval *);
-
-#ifdef _END_DECLS
-_END_DECLS
-#endif
-
 #endif /* _RUMP_RUMP_SYSCALLS_COMPAT_H_ */

CVS commit: src/sys/rump/include/rump

2011-01-12 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Jan 12 12:51:47 UTC 2011

Modified Files:
src/sys/rump/include/rump: rumpuser.h

Log Message:
add spop_procexit


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 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.61 src/sys/rump/include/rump/rumpuser.h:1.62
--- src/sys/rump/include/rump/rumpuser.h:1.61	Sun Jan  2 12:52:25 2011
+++ src/sys/rump/include/rump/rumpuser.h	Wed Jan 12 12:51:47 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.61 2011/01/02 12:52:25 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.62 2011/01/12 12:51:47 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -36,7 +36,7 @@
 #include 
 #endif
 
-#define RUMPUSER_VERSION 8
+#define RUMPUSER_VERSION 9
 int rumpuser_getversion(void);
 
 int rumpuser_daemonize_begin(void);
@@ -218,6 +218,7 @@
 	int (*spop_lwproc_newlwp)(pid_t);
 	struct lwp * (*spop_lwproc_curlwp)(void);
 	int (*spop_syscall)(int, void *, register_t *);
+	void (*spop_procexit)(void);
 	pid_t (*spop_getpid)(void);
 };

CVS commit: src/sys/rump/include/rump

2010-12-01 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Dec  1 15:02:05 UTC 2010

Modified Files:
src/sys/rump/include/rump: rumpuser.h

Log Message:
rumpuser interface changed


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 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.55 src/sys/rump/include/rump/rumpuser.h:1.56
--- src/sys/rump/include/rump/rumpuser.h:1.55	Wed Dec  1 14:59:39 2010
+++ src/sys/rump/include/rump/rumpuser.h	Wed Dec  1 15:02:04 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.55 2010/12/01 14:59:39 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.56 2010/12/01 15:02:04 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -36,7 +36,7 @@
 #include 
 #endif
 
-#define RUMPUSER_VERSION 6
+#define RUMPUSER_VERSION 7
 int rumpuser_getversion(void);
 
 int rumpuser_daemonize_begin(void);

CVS commit: src/sys/rump/include/rump

2010-11-30 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Tue Nov 30 10:46:59 UTC 2010

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
RUMPCN_FORCEFREE is no longer needed.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 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.47 src/sys/rump/include/rump/rump.h:1.48
--- src/sys/rump/include/rump/rump.h:1.47	Mon Nov 15 20:37:21 2010
+++ src/sys/rump/include/rump/rump.h	Tue Nov 30 10:46:59 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.47 2010/11/15 20:37:21 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.48 2010/11/30 10:46:59 dholland Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -75,7 +75,6 @@
 
 /* rumpvfs */
 #define RUMPCN_FREECRED  0x02
-#define RUMPCN_FORCEFREE 0x04
 #define RUMP_ETFS_SIZE_ENDOFF ((uint64_t)-1)
 enum rump_etfs_type {
 	RUMP_ETFS_REG,

CVS commit: src/sys/rump/include/rump

2010-11-04 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Thu Nov  4 20:57:01 UTC 2010

Modified Files:
src/sys/rump/include/rump: rumpuser.h

Log Message:
bump rumpuser version


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 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.49 src/sys/rump/include/rump/rumpuser.h:1.50
--- src/sys/rump/include/rump/rumpuser.h:1.49	Thu Nov  4 20:54:08 2010
+++ src/sys/rump/include/rump/rumpuser.h	Thu Nov  4 20:57:00 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.49 2010/11/04 20:54:08 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.50 2010/11/04 20:57:00 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -36,7 +36,7 @@
 #include 
 #endif
 
-#define RUMPUSER_VERSION 2
+#define RUMPUSER_VERSION 3
 int rumpuser_getversion(void);
 
 struct msghdr;

CVS commit: src/sys/rump/include/rump

2010-09-06 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Sep  6 18:43:29 UTC 2010

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
add a few more system calls


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 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.44 src/sys/rump/include/rump/rump.h:1.45
--- src/sys/rump/include/rump/rump.h:1.44	Tue May 11 20:09:11 2010
+++ src/sys/rump/include/rump/rump.h	Mon Sep  6 18:43:28 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.44 2010/05/11 20:09:11 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.45 2010/09/06 18:43:28 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -141,6 +141,7 @@
 
 #ifdef RUMP_SYS_IOCTL
 #define ioctl(...) rump_sys_ioctl(__VA_ARGS__)
+#define fnctl(...) rump_sys_fcntl(__VA_ARGS__)
 #endif /* RUMP_SYS_IOCTL */
 
 #ifdef RUMP_SYS_CLOSE
@@ -169,6 +170,29 @@
 #define symlink(a,b) rump_sys_symlink(a,b)
 #define unlink(a) rump_sys_unlink(a)
 #define readlink(a,b,c) rump_sys_readlink(a,b,c)
+#define chdir(a) rump_sys_chdir(a)
+#define fsync(a) rump_sys_fsync(a)
+#define sync() rump_sys_sync()
+#define chown(a,b,c) rump_sys_chown(a,b,c)
+#define fchown(a,b,c) rump_sys_fchown(a,b,c)
+#define lchown(a,b,c) rump_sys_lchown(a,b,c)
+#define lseek(a,b,c) rump_sys_lseek(a,b,c)
+#define mknod(a,b,c) rump_sys_mknod(a,b,c)
+#define rename(a,b) rump_sys_rename(a,b)
+#define truncate(a,b) rump_sys_truncate(a,b)
+#define ftruncate(a,b) rump_sys_ftruncate(a,b)
+#define umask(a) rump_sys_umask(a)
+#define getdents(a,b,c) rump_sys_getdents(a,b,c)
 #endif /* RUMP_SYS_FILEOPS */
 
+#ifdef RUMP_SYS_STAT
+#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
+#define getpid() rump_sys_getpid()
+#endif /* RUMP_SYS_PROCOPS */
+
 #endif /* _RUMP_RUMP_H_ */

CVS commit: src/sys/rump/include/rump

2010-08-24 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue Aug 24 13:19:04 UTC 2010

Modified Files:
src/sys/rump/include/rump: Makefile
Added Files:
src/sys/rump/include/rump: scsitest.h

Log Message:
whoopsie, need to commit this as part of scsitest


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/include/rump/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/rump/scsitest.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/Makefile
diff -u src/sys/rump/include/rump/Makefile:1.3 src/sys/rump/include/rump/Makefile:1.4
--- src/sys/rump/include/rump/Makefile:1.3	Mon Jul 19 15:28:19 2010
+++ src/sys/rump/include/rump/Makefile	Tue Aug 24 13:19:04 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/07/19 15:28:19 pooka Exp $
+#	$NetBSD: Makefile,v 1.4 2010/08/24 13:19:04 pooka Exp $
 
 INCSDIR=	/usr/include/rump
 
@@ -7,4 +7,6 @@
 
 INCS+=		rumpkern_if_pub.h rumpvfs_if_pub.h rumpnet_if_pub.h
 
+INCS+=		scsitest.h
+
 .include 

Added files:

Index: src/sys/rump/include/rump/scsitest.h
diff -u /dev/null src/sys/rump/include/rump/scsitest.h:1.1
--- /dev/null	Tue Aug 24 13:19:04 2010
+++ src/sys/rump/include/rump/scsitest.h	Tue Aug 24 13:19:04 2010
@@ -0,0 +1,38 @@
+/*	$NetBSD: scsitest.h,v 1.1 2010/08/24 13:19:04 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _RUMP_SCSITEST_H_
+#define _RUMP_SCSITEST_H_
+
+enum {
+	RUMP_SCSITEST_NOISYSYNC,
+	RUMP_SCSITEST_MAXERROR
+};
+
+extern unsigned rump_scsitest_err[RUMP_SCSITEST_MAXERROR];
+
+#endif /* _RUMP_SCSITEST_H_ */

CVS commit: src/sys/rump/include/rump

2010-07-28 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Wed Jul 28 09:32:13 UTC 2010

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
Regen. LK_INTERLOCK is gone.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.8 src/sys/rump/include/rump/rumpdefs.h:1.9
--- src/sys/rump/include/rump/rumpdefs.h:1.8	Fri Jul  2 10:45:16 2010
+++ src/sys/rump/include/rump/rumpdefs.h	Wed Jul 28 09:32:13 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.8 2010/07/02 10:45:16 hannken Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.9 2010/07/28 09:32:13 hannken Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -29,7 +29,7 @@
 #define	RUMP_O_DIRECT	0x0008	/* direct I/O hint */
 #define	RUMP_O_NOCTTY	0x8000	/* don't assign controlling terminal */
 
-/*	NetBSD: vnode.h,v 1.221 2010/07/01 13:00:57 hannken Exp 	*/
+/*	NetBSD: vnode.h,v 1.222 2010/07/28 09:31:00 hannken Exp 	*/
 #ifndef __VTYPE_DEFINED
 #define __VTYPE_DEFINED
 enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD };
@@ -37,7 +37,6 @@
 #define	RUMP_LK_SHARED	0x0001	
 #define	RUMP_LK_EXCLUSIVE	0x0002	
 #define	RUMP_LK_NOWAIT	0x0010	
-#define	RUMP_LK_INTERLOCK	0x0001	
 #define	RUMP_LK_RETRY	0x0002	
 
 /*	NetBSD: errno.h,v 1.39 2006/10/31 00:38:07 cbiere Exp 	*/

CVS commit: src/sys/rump/include/rump

2010-07-19 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jul 19 15:38:29 UTC 2010

Modified Files:
src/sys/rump/include/rump: rumpkern_if_pub.h

Log Message:
regen from ages ago (to get rcsid consistent)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/include/rump/rumpkern_if_pub.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/rumpkern_if_pub.h
diff -u src/sys/rump/include/rump/rumpkern_if_pub.h:1.7 src/sys/rump/include/rump/rumpkern_if_pub.h:1.8
--- src/sys/rump/include/rump/rumpkern_if_pub.h:1.7	Wed Apr 14 14:14:53 2010
+++ src/sys/rump/include/rump/rumpkern_if_pub.h	Mon Jul 19 15:38:28 2010
@@ -1,8 +1,8 @@
-/*	$NetBSD: rumpkern_if_pub.h,v 1.7 2010/04/14 14:14:53 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_pub.h,v 1.8 2010/07/19 15:38:28 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.4 2010/03/05 18:41:46 pooka Exp 
+ * from: NetBSD: rumpkern.ifspec,v 1.5 2010/04/14 14:12:48 pooka Exp 
  * by:   NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp 
  */

CVS commit: src/sys/rump/include/rump

2010-07-19 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jul 19 15:38:04 UTC 2010

Modified Files:
src/sys/rump/include/rump: rump_syscalls_compat.h

Log Message:
Add some forward declarations used by the interfaces.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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.1 src/sys/rump/include/rump/rump_syscalls_compat.h:1.2
--- src/sys/rump/include/rump/rump_syscalls_compat.h:1.1	Mon Jul 19 15:28:20 2010
+++ src/sys/rump/include/rump/rump_syscalls_compat.h	Mon Jul 19 15:38:03 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_syscalls_compat.h,v 1.1 2010/07/19 15:28:20 pooka Exp $	*/
+/*	$NetBSD: rump_syscalls_compat.h,v 1.2 2010/07/19 15:38:03 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -51,6 +51,9 @@
 _BEGIN_DECLS  
 #endif
 
+struct stat;
+struct pollfd;
+struct timespec;
 int rump_sys_nb5_stat(const char *, struct stat *);
 int rump_sys_nb5_lstat(const char *, struct stat *);
 int rump_sys_nb5_pollts(struct pollfd *, size_t,

CVS commit: src/sys/rump/include/rump

2010-07-02 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Fri Jul  2 10:45:16 UTC 2010

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
Regen.  LK_TYPEMASK and LK_RELEASE are gone.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/sys/rump/include/rump/rumpdefs.h:1.8
--- src/sys/rump/include/rump/rumpdefs.h:1.7	Thu Jun 24 07:56:22 2010
+++ src/sys/rump/include/rump/rumpdefs.h	Fri Jul  2 10:45:16 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.7 2010/06/24 07:56:22 hannken Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.8 2010/07/02 10:45:16 hannken Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -29,26 +29,22 @@
 #define	RUMP_O_DIRECT	0x0008	/* direct I/O hint */
 #define	RUMP_O_NOCTTY	0x8000	/* don't assign controlling terminal */
 
-/*	NetBSD: vnode.h,v 1.220 2010/06/18 16:29:02 hannken Exp 	*/
+/*	NetBSD: vnode.h,v 1.221 2010/07/01 13:00:57 hannken Exp 	*/
 #ifndef __VTYPE_DEFINED
 #define __VTYPE_DEFINED
 enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD };
 #endif /* __VTYPE_DEFINED */
-
-/*	NetBSD: errno.h,v 1.39 2006/10/31 00:38:07 cbiere Exp 	*/
-#ifndef EJUSTRETURN
-#define	EJUSTRETURN	-2		/* don't modify regs, just return */
-#endif /* EJUSTRETURN */
-
-/*	NetBSD: lock.h,v 1.85 2010/06/24 07:54:47 hannken Exp 	*/
-#define	RUMP_LK_TYPE_MASK	0x000f	
 #define	RUMP_LK_SHARED	0x0001	
 #define	RUMP_LK_EXCLUSIVE	0x0002	
-#define	RUMP_LK_RELEASE	0x0006	
 #define	RUMP_LK_NOWAIT	0x0010	
 #define	RUMP_LK_INTERLOCK	0x0001	
 #define	RUMP_LK_RETRY	0x0002	
 
+/*	NetBSD: errno.h,v 1.39 2006/10/31 00:38:07 cbiere Exp 	*/
+#ifndef EJUSTRETURN
+#define	EJUSTRETURN	-2		/* don't modify regs, just return */
+#endif /* EJUSTRETURN */
+
 /*	NetBSD: reboot.h,v 1.25 2007/12/25 18:33:48 perry Exp 	*/
 #define	RUMP_RB_AUTOBOOT	0	
 #define	RUMP_RB_ASKNAME	0x0001

CVS commit: src/sys/rump/include/rump

2010-07-02 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Fri Jul  2 10:44:26 UTC 2010

Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh

Log Message:
LK_* flags moved to sys/vnode.h


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/sys/rump/include/rump/makerumpdefs.sh:1.6
--- src/sys/rump/include/rump/makerumpdefs.sh:1.5	Tue Nov  3 18:22:44 2009
+++ src/sys/rump/include/rump/makerumpdefs.sh	Fri Jul  2 10:44:26 2010
@@ -8,7 +8,7 @@
 rm -f rumpdefs.h
 exec > rumpdefs.h
 
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.5 2009/11/03 18:22:44 pooka Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.6 2010/07/02 10:44:26 hannken 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'
@@ -27,16 +27,14 @@
 printf '#ifndef __VTYPE_DEFINED\n#define __VTYPE_DEFINED\n'
 sed -n '/enum vtype.*{/p' < ../../../sys/vnode.h
 printf '#endif /* __VTYPE_DEFINED */\n'
+sed -n '/#define.*LK_[A-Z]/s/LK_/RUMP_LK_/gp' <../../../sys/vnode.h	\
+| sed 's,/\*.*$,,'
 
 fromvers ../../../sys/errno.h
 printf '#ifndef EJUSTRETURN\n'
 sed -n '/EJUSTRETURN/p'	< ../../../sys/errno.h
 printf '#endif /* EJUSTRETURN */\n'
 
-fromvers ../../../sys/lock.h
-sed -n '/#define.*LK_[A-Z]/s/LK_/RUMP_LK_/gp' <../../../sys/lock.h	\
-| sed 's,/\*.*$,,'
-
 fromvers ../../../sys/reboot.h
 sed -n '/#define.*RB_[A-Z]/s/RB_/RUMP_RB_/gp' <../../../sys/reboot.h	\
 | sed 's,/\*.*$,,'

CVS commit: src/sys/rump/include/rump

2010-06-24 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Thu Jun 24 07:56:22 UTC 2010

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
Regen. LK_EXCLOTHER has gone.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/sys/rump/include/rump/rumpdefs.h:1.7
--- src/sys/rump/include/rump/rumpdefs.h:1.6	Fri Jun 18 16:31:34 2010
+++ src/sys/rump/include/rump/rumpdefs.h	Thu Jun 24 07:56:22 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.6 2010/06/18 16:31:34 hannken Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.7 2010/06/24 07:56:22 hannken Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -40,12 +40,11 @@
 #define	EJUSTRETURN	-2		/* don't modify regs, just return */
 #endif /* EJUSTRETURN */
 
-/*	NetBSD: lock.h,v 1.84 2010/06/18 16:29:02 hannken Exp 	*/
+/*	NetBSD: lock.h,v 1.85 2010/06/24 07:54:47 hannken Exp 	*/
 #define	RUMP_LK_TYPE_MASK	0x000f	
 #define	RUMP_LK_SHARED	0x0001	
 #define	RUMP_LK_EXCLUSIVE	0x0002	
 #define	RUMP_LK_RELEASE	0x0006	
-#define	RUMP_LK_EXCLOTHER	0x0008	
 #define	RUMP_LK_NOWAIT	0x0010	
 #define	RUMP_LK_INTERLOCK	0x0001	
 #define	RUMP_LK_RETRY	0x0002

CVS commit: src/sys/rump/include/rump

2010-06-18 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Fri Jun 18 16:31:35 UTC 2010

Modified Files:
src/sys/rump/include/rump: rumpdefs.h

Log Message:
Regen (LK_CANRECURSE is gone).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/sys/rump/include/rump/rumpdefs.h:1.6
--- src/sys/rump/include/rump/rumpdefs.h:1.5	Tue Nov  3 18:23:15 2009
+++ src/sys/rump/include/rump/rumpdefs.h	Fri Jun 18 16:31:34 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdefs.h,v 1.5 2009/11/03 18:23:15 pooka Exp $	*/
+/*	$NetBSD: rumpdefs.h,v 1.6 2010/06/18 16:31:34 hannken Exp $	*/
 
 /*
  *	AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -29,7 +29,7 @@
 #define	RUMP_O_DIRECT	0x0008	/* direct I/O hint */
 #define	RUMP_O_NOCTTY	0x8000	/* don't assign controlling terminal */
 
-/*	NetBSD: vnode.h,v 1.210 2009/10/06 04:28:10 elad Exp 	*/
+/*	NetBSD: vnode.h,v 1.220 2010/06/18 16:29:02 hannken Exp 	*/
 #ifndef __VTYPE_DEFINED
 #define __VTYPE_DEFINED
 enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD };
@@ -40,14 +40,13 @@
 #define	EJUSTRETURN	-2		/* don't modify regs, just return */
 #endif /* EJUSTRETURN */
 
-/*	NetBSD: lock.h,v 1.83 2008/04/28 20:24:10 martin Exp 	*/
+/*	NetBSD: lock.h,v 1.84 2010/06/18 16:29:02 hannken Exp 	*/
 #define	RUMP_LK_TYPE_MASK	0x000f	
 #define	RUMP_LK_SHARED	0x0001	
 #define	RUMP_LK_EXCLUSIVE	0x0002	
 #define	RUMP_LK_RELEASE	0x0006	
 #define	RUMP_LK_EXCLOTHER	0x0008	
 #define	RUMP_LK_NOWAIT	0x0010	
-#define	RUMP_LK_CANRECURSE	0x0040	
 #define	RUMP_LK_INTERLOCK	0x0001	
 #define	RUMP_LK_RETRY	0x0002

CVS commit: src/sys/rump/include/rump

2010-05-17 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Mon May 17 12:37:20 UTC 2010

Modified Files:
src/sys/rump/include/rump: rump_syscalls.h

Log Message:
Regen for multiple inclusion protection.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/include/rump/rump_syscalls.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.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.23 src/sys/rump/include/rump/rump_syscalls.h:1.24
--- src/sys/rump/include/rump/rump_syscalls.h:1.23	Tue May 11 20:11:47 2010
+++ src/sys/rump/include/rump/rump_syscalls.h	Mon May 17 12:37:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.h,v 1.23 2010/05/11 20:11:47 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.24 2010/05/17 12:37:20 njoly Exp $ */
 
 /*
  * System call protos in rump namespace.
@@ -7,6 +7,9 @@
  * created from	NetBSD: syscalls.master,v 1.233 2010/04/21 16:17:04 pooka Exp
  */
 
+#ifndef _RUMP_RUMP_SYSCALLS_H_
+#define _RUMP_RUMP_SYSCALLS_H_
+
 #ifdef _KERNEL
 #error Interface not supported inside kernel
 #endif /* _KERNEL */
@@ -129,3 +132,5 @@
 int rump_sys_mknod(const char *, mode_t, dev_t) __RENAME(rump_sys___mknod50);
 int rump_sys_fhstat(const void *, size_t, struct stat *) __RENAME(rump_sys___fhstat50);
 int rump_sys_pipe(int *);
+
+#endif /* _RUMP_RUMP_SYSCALLS_H_ */

CVS commit: src/sys/rump/include/rump

2010-05-11 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue May 11 20:09:12 UTC 2010

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
_RUMPKERNEL -> _KERNEL


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 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.43 src/sys/rump/include/rump/rump.h:1.44
--- src/sys/rump/include/rump/rump.h:1.43	Sat May  1 23:16:31 2010
+++ src/sys/rump/include/rump/rump.h	Tue May 11 20:09:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.43 2010/05/01 23:16:31 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.44 2010/05/11 20:09:11 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -108,7 +108,7 @@
 
 int	rump__init(int);
 
-#ifndef _RUMPKERNEL
+#ifndef _KERNEL
 #include 
 #include 
 #include

CVS commit: src/sys/rump/include/rump

2010-05-01 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sat May  1 23:16:31 UTC 2010

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
forward-declare struct uio (required by rumpvnode_if.h)


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 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.42 src/sys/rump/include/rump/rump.h:1.43
--- src/sys/rump/include/rump/rump.h:1.42	Sat May  1 14:40:36 2010
+++ src/sys/rump/include/rump/rump.h	Sat May  1 23:16:31 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.42 2010/05/01 14:40:36 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.43 2010/05/01 23:16:31 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -46,6 +46,7 @@
 struct kauth_cred;
 struct lwp;
 struct modinfo;
+struct uio;
 
 /* yetch */
 #if defined(__NetBSD__)

CVS commit: src/sys/rump/include/rump

2010-04-23 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Apr 24 01:47:34 UTC 2010

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
Remove trailing comma in enum, per PR kern/43200.

(trailing commas in enums are allowed in C99, but not C89, and possibly
not in C++, so let's be nice to older and deviant compilers)


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 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.39 src/sys/rump/include/rump/rump.h:1.40
--- src/sys/rump/include/rump/rump.h:1.39	Wed Apr 21 11:38:05 2010
+++ src/sys/rump/include/rump/rump.h	Sat Apr 24 01:47:34 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.39 2010/04/21 11:38:05 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.40 2010/04/24 01:47:34 dholland Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -69,7 +69,7 @@
 	RUMP_SIGMODEL_PANIC,
 	RUMP_SIGMODEL_IGNORE,
 	RUMP_SIGMODEL_HOST,
-	RUMP_SIGMODEL_RAISE,
+	RUMP_SIGMODEL_RAISE
 };
 
 /* rumpvfs */

CVS commit: src/sys/rump/include/rump

2010-02-24 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Feb 24 14:56:04 UTC 2010

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
Expose rump_schedule() and rump_unschedule().  These can be used
for wrapping application space calls to the rump kernel without
having to do heavyweight interface specification with ifspec.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 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.36 src/sys/rump/include/rump/rump.h:1.37
--- src/sys/rump/include/rump/rump.h:1.36	Thu Feb 11 01:13:58 2010
+++ src/sys/rump/include/rump/rump.h	Wed Feb 24 14:56:04 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.36 2010/02/11 01:13:58 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.37 2010/02/24 14:56:04 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -90,6 +90,9 @@
 int	rump_boot_gethowto(void);
 void	rump_boot_sethowto(int);
 
+void	rump_schedule(void);
+void	rump_unschedule(void);
+
 int	rump__init(int);
 
 #ifndef _RUMPKERNEL

1 2 >

1 - 100 of 118 matches

Mail list logo