Module Name: src
Committed By: christos
Date: Sun Sep 22 23:03:21 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump: rump.sysmap
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c rumpkern_syscalls.c
src/sys/rump/librump/rumpnet: rumpnet_syscalls.c
src/sys/rump/librump/rumpvfs: rumpvfs_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.141 -r1.142 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.140 -r1.141 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.32 -r1.33 src/sys/compat/netbsd32/netbsd32_systrace_args.c
cvs rdiff -u -r1.324 -r1.325 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.313 -r1.314 src/sys/kern/syscalls.c
cvs rdiff -u -r1.30 -r1.31 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.32 -r1.33 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/rump.sysmap
cvs rdiff -u -r1.111 -r1.112 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.141 -r1.142 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c
cvs rdiff -u -r1.307 -r1.308 src/sys/sys/syscall.h
cvs rdiff -u -r1.291 -r1.292 src/sys/sys/syscallargs.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/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.142 src/sys/compat/netbsd32/netbsd32_syscall.h:1.143
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.142 Tue Jun 18 12:24:32 2019
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sun Sep 22 19:03:20 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.142 2019/06/18 16:24:32 christos Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.143 2019/09/22 23:03:20 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
+ * created from NetBSD: syscalls.master,v 1.128 2019/09/22 22:59:38 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -927,16 +927,16 @@
/* syscall: "netbsd32_uuidgen" ret: "int" args: "netbsd32_uuidp_t" "int" */
#define NETBSD32_SYS_netbsd32_uuidgen 355
-/* syscall: "netbsd32_getvfsstat" ret: "int" args: "netbsd32_statvfsp_t" "netbsd32_size_t" "int" */
-#define NETBSD32_SYS_netbsd32_getvfsstat 356
+/* syscall: "compat_90_netbsd32_getvfsstat" ret: "int" args: "netbsd32_statvfs90p_t" "netbsd32_size_t" "int" */
+#define NETBSD32_SYS_compat_90_netbsd32_getvfsstat 356
-/* syscall: "netbsd32_statvfs1" ret: "int" args: "netbsd32_charp" "netbsd32_statvfsp_t" "int" */
-#define NETBSD32_SYS_netbsd32_statvfs1 357
+/* syscall: "compat_90_netbsd32_statvfs1" ret: "int" args: "netbsd32_charp" "netbsd32_statvfs90p_t" "int" */
+#define NETBSD32_SYS_compat_90_netbsd32_statvfs1 357
-/* syscall: "netbsd32_fstatvfs1" ret: "int" args: "int" "netbsd32_statvfsp_t" "int" */
-#define NETBSD32_SYS_netbsd32_fstatvfs1 358
+/* syscall: "compat_90_netbsd32_fstatvfs1" ret: "int" args: "int" "netbsd32_statvfs90p_t" "int" */
+#define NETBSD32_SYS_compat_90_netbsd32_fstatvfs1 358
-/* syscall: "compat_30_netbsd32_fhstatvfs1" ret: "int" args: "netbsd32_fhandlep_t" "netbsd32_statvfsp_t" "int" */
+/* syscall: "compat_30_netbsd32_fhstatvfs1" ret: "int" args: "netbsd32_fhandlep_t" "netbsd32_statvfs90p_t" "int" */
#define NETBSD32_SYS_compat_30_netbsd32_fhstatvfs1 359
/* syscall: "netbsd32_extattrctl" ret: "int" args: "netbsd32_charp" "int" "netbsd32_charp" "int" "netbsd32_charp" */
@@ -1048,8 +1048,8 @@
/* syscall: "netbsd32___fhopen40" ret: "int" args: "netbsd32_pointer_t" "netbsd32_size_t" "int" */
#define NETBSD32_SYS_netbsd32___fhopen40 396
-/* syscall: "netbsd32___fhstatvfs140" ret: "int" args: "netbsd32_pointer_t" "netbsd32_size_t" "netbsd32_statvfsp_t" "int" */
-#define NETBSD32_SYS_netbsd32___fhstatvfs140 397
+/* syscall: "compat_90_netbsd32_fhstatvfs1" ret: "int" args: "netbsd32_pointer_t" "netbsd32_size_t" "netbsd32_statvfs90p_t" "int" */
+#define NETBSD32_SYS_compat_90_netbsd32_fhstatvfs1 397
/* syscall: "compat_50_netbsd32___fhstat40" ret: "int" args: "netbsd32_pointer_t" "netbsd32_size_t" "netbsd32_stat50p_t" */
#define NETBSD32_SYS_compat_50_netbsd32___fhstat40 398
@@ -1274,6 +1274,18 @@
/* syscall: "netbsd32_clock_getcpuclockid2" ret: "int" args: "idtype_t" "id_t" "netbsd32_clockidp_t" */
#define NETBSD32_SYS_netbsd32_clock_getcpuclockid2 482
-#define NETBSD32_SYS_MAXSYSCALL 483
+/* syscall: "netbsd32___getvfsstat90" ret: "int" args: "netbsd32_statvfsp_t" "size_t" "int" */
+#define NETBSD32_SYS_netbsd32___getvfsstat90 483
+
+/* syscall: "netbsd32___statvfs190" ret: "int" args: "netbsd32_charp" "netbsd32_statvfsp_t" "int" */
+#define NETBSD32_SYS_netbsd32___statvfs190 484
+
+/* syscall: "netbsd32___fstatvfs190" ret: "int" args: "int" "netbsd32_statvfsp_t" "int" */
+#define NETBSD32_SYS_netbsd32___fstatvfs190 485
+
+/* syscall: "netbsd32___fhstatvfs190" ret: "int" args: "netbsd32_voidp" "size_t" "netbsd32_statvfsp_t" "int" */
+#define NETBSD32_SYS_netbsd32___fhstatvfs190 486
+
+#define NETBSD32_SYS_MAXSYSCALL 487
#define NETBSD32_SYS_NSYSENT 512
#endif /* _NETBSD32_SYS_SYSCALL_H_ */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.141 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.142
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.141 Tue Jun 18 12:24:32 2019
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sun Sep 22 19:03:20 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.141 2019/06/18 16:24:32 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.142 2019/09/22 23:03:20 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
+ * created from NetBSD: syscalls.master,v 1.128 2019/09/22 22:59:38 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -1782,30 +1782,30 @@ struct netbsd32_uuidgen_args {
};
check_syscall_args(netbsd32_uuidgen)
-struct netbsd32_getvfsstat_args {
- syscallarg(netbsd32_statvfsp_t) buf;
+struct compat_90_netbsd32_getvfsstat_args {
+ syscallarg(netbsd32_statvfs90p_t) buf;
syscallarg(netbsd32_size_t) bufsize;
syscallarg(int) flags;
};
-check_syscall_args(netbsd32_getvfsstat)
+check_syscall_args(compat_90_netbsd32_getvfsstat)
-struct netbsd32_statvfs1_args {
+struct compat_90_netbsd32_statvfs1_args {
syscallarg(netbsd32_charp) path;
- syscallarg(netbsd32_statvfsp_t) buf;
+ syscallarg(netbsd32_statvfs90p_t) buf;
syscallarg(int) flags;
};
-check_syscall_args(netbsd32_statvfs1)
+check_syscall_args(compat_90_netbsd32_statvfs1)
-struct netbsd32_fstatvfs1_args {
+struct compat_90_netbsd32_fstatvfs1_args {
syscallarg(int) fd;
- syscallarg(netbsd32_statvfsp_t) buf;
+ syscallarg(netbsd32_statvfs90p_t) buf;
syscallarg(int) flags;
};
-check_syscall_args(netbsd32_fstatvfs1)
+check_syscall_args(compat_90_netbsd32_fstatvfs1)
struct compat_30_netbsd32_fhstatvfs1_args {
syscallarg(netbsd32_fhandlep_t) fhp;
- syscallarg(netbsd32_statvfsp_t) buf;
+ syscallarg(netbsd32_statvfs90p_t) buf;
syscallarg(int) flags;
};
check_syscall_args(compat_30_netbsd32_fhstatvfs1)
@@ -2083,13 +2083,13 @@ struct netbsd32___fhopen40_args {
};
check_syscall_args(netbsd32___fhopen40)
-struct netbsd32___fhstatvfs140_args {
+struct compat_90_netbsd32_fhstatvfs1_args {
syscallarg(netbsd32_pointer_t) fhp;
syscallarg(netbsd32_size_t) fh_size;
- syscallarg(netbsd32_statvfsp_t) buf;
+ syscallarg(netbsd32_statvfs90p_t) buf;
syscallarg(int) flags;
};
-check_syscall_args(netbsd32___fhstatvfs140)
+check_syscall_args(compat_90_netbsd32_fhstatvfs1)
struct compat_50_netbsd32___fhstat40_args {
syscallarg(netbsd32_pointer_t) fhp;
@@ -2622,6 +2622,35 @@ struct netbsd32_clock_getcpuclockid2_arg
};
check_syscall_args(netbsd32_clock_getcpuclockid2)
+struct netbsd32___getvfsstat90_args {
+ syscallarg(netbsd32_statvfsp_t) buf;
+ syscallarg(size_t) bufsize;
+ syscallarg(int) flags;
+};
+check_syscall_args(netbsd32___getvfsstat90)
+
+struct netbsd32___statvfs190_args {
+ syscallarg(netbsd32_charp) path;
+ syscallarg(netbsd32_statvfsp_t) buf;
+ syscallarg(int) flags;
+};
+check_syscall_args(netbsd32___statvfs190)
+
+struct netbsd32___fstatvfs190_args {
+ syscallarg(int) fd;
+ syscallarg(netbsd32_statvfsp_t) buf;
+ syscallarg(int) flags;
+};
+check_syscall_args(netbsd32___fstatvfs190)
+
+struct netbsd32___fhstatvfs190_args {
+ syscallarg(netbsd32_voidp) fhp;
+ syscallarg(size_t) fh_size;
+ syscallarg(netbsd32_statvfsp_t) buf;
+ syscallarg(int) flags;
+};
+check_syscall_args(netbsd32___fhstatvfs190)
+
/*
* System call prototypes.
*/
@@ -3220,11 +3249,11 @@ int netbsd32_fsync_range(struct lwp *, c
int netbsd32_uuidgen(struct lwp *, const struct netbsd32_uuidgen_args *, register_t *);
-int netbsd32_getvfsstat(struct lwp *, const struct netbsd32_getvfsstat_args *, register_t *);
+int compat_90_netbsd32_getvfsstat(struct lwp *, const struct compat_90_netbsd32_getvfsstat_args *, register_t *);
-int netbsd32_statvfs1(struct lwp *, const struct netbsd32_statvfs1_args *, register_t *);
+int compat_90_netbsd32_statvfs1(struct lwp *, const struct compat_90_netbsd32_statvfs1_args *, register_t *);
-int netbsd32_fstatvfs1(struct lwp *, const struct netbsd32_fstatvfs1_args *, register_t *);
+int compat_90_netbsd32_fstatvfs1(struct lwp *, const struct compat_90_netbsd32_fstatvfs1_args *, register_t *);
int compat_30_netbsd32_fhstatvfs1(struct lwp *, const struct compat_30_netbsd32_fhstatvfs1_args *, register_t *);
@@ -3300,7 +3329,7 @@ int netbsd32___getfh30(struct lwp *, con
int netbsd32___fhopen40(struct lwp *, const struct netbsd32___fhopen40_args *, register_t *);
-int netbsd32___fhstatvfs140(struct lwp *, const struct netbsd32___fhstatvfs140_args *, register_t *);
+int compat_90_netbsd32_fhstatvfs1(struct lwp *, const struct compat_90_netbsd32_fhstatvfs1_args *, register_t *);
int compat_50_netbsd32___fhstat40(struct lwp *, const struct compat_50_netbsd32___fhstat40_args *, register_t *);
@@ -3450,4 +3479,12 @@ int netbsd32_wait6(struct lwp *, const s
int netbsd32_clock_getcpuclockid2(struct lwp *, const struct netbsd32_clock_getcpuclockid2_args *, register_t *);
+int netbsd32___getvfsstat90(struct lwp *, const struct netbsd32___getvfsstat90_args *, register_t *);
+
+int netbsd32___statvfs190(struct lwp *, const struct netbsd32___statvfs190_args *, register_t *);
+
+int netbsd32___fstatvfs190(struct lwp *, const struct netbsd32___fstatvfs190_args *, register_t *);
+
+int netbsd32___fhstatvfs190(struct lwp *, const struct netbsd32___fhstatvfs190_args *, register_t *);
+
#endif /* _NETBSD32_SYS_SYSCALLARGS_H_ */
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.141 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.142
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.141 Tue Jun 18 12:24:32 2019
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sun Sep 22 19:03:20 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.141 2019/06/18 16:24:32 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.142 2019/09/22 23:03:20 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
+ * created from NetBSD: syscalls.master,v 1.128 2019/09/22 22:59:38 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.141 2019/06/18 16:24:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.142 2019/09/22 23:03:20 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -395,9 +395,9 @@ const char *const netbsd32_syscallnames[
/* 353 */ "#353 (unimplemented)",
/* 354 */ "netbsd32_fsync_range",
/* 355 */ "netbsd32_uuidgen",
- /* 356 */ "netbsd32_getvfsstat",
- /* 357 */ "netbsd32_statvfs1",
- /* 358 */ "netbsd32_fstatvfs1",
+ /* 356 */ "compat_90_netbsd32_getvfsstat",
+ /* 357 */ "compat_90_netbsd32_statvfs1",
+ /* 358 */ "compat_90_netbsd32_fstatvfs1",
/* 359 */ "compat_30_netbsd32_fhstatvfs1",
/* 360 */ "netbsd32_extattrctl",
/* 361 */ "netbsd32_extattr_set_file",
@@ -436,7 +436,7 @@ const char *const netbsd32_syscallnames[
/* 394 */ "netbsd32___socket30",
/* 395 */ "netbsd32___getfh30",
/* 396 */ "netbsd32___fhopen40",
- /* 397 */ "netbsd32___fhstatvfs140",
+ /* 397 */ "compat_90_netbsd32_fhstatvfs1",
/* 398 */ "compat_50_netbsd32___fhstat40",
/* 399 */ "#399 (unimplemented sys_aio_cancel)",
/* 400 */ "#400 (unimplemented sys_aio_error)",
@@ -530,10 +530,10 @@ const char *const netbsd32_syscallnames[
/* 480 */ "netbsd32_fdiscard",
/* 481 */ "netbsd32_wait6",
/* 482 */ "netbsd32_clock_getcpuclockid2",
- /* 483 */ "# filler",
- /* 484 */ "# filler",
- /* 485 */ "# filler",
- /* 486 */ "# filler",
+ /* 483 */ "netbsd32___getvfsstat90",
+ /* 484 */ "netbsd32___statvfs190",
+ /* 485 */ "netbsd32___fstatvfs190",
+ /* 486 */ "netbsd32___fhstatvfs190",
/* 487 */ "# filler",
/* 488 */ "# filler",
/* 489 */ "# filler",
@@ -929,9 +929,9 @@ const char *const altnetbsd32_syscallnam
/* 353 */ NULL, /* unimplemented */
/* 354 */ "fsync_range",
/* 355 */ "uuidgen",
- /* 356 */ "getvfsstat",
- /* 357 */ "statvfs1",
- /* 358 */ "fstatvfs1",
+ /* 356 */ NULL, /* compat_90_netbsd32_getvfsstat */
+ /* 357 */ NULL, /* compat_90_netbsd32_statvfs1 */
+ /* 358 */ NULL, /* compat_90_netbsd32_fstatvfs1 */
/* 359 */ NULL, /* compat_30_netbsd32_fhstatvfs1 */
/* 360 */ "extattrctl",
/* 361 */ "extattr_set_file",
@@ -970,7 +970,7 @@ const char *const altnetbsd32_syscallnam
/* 394 */ "socket",
/* 395 */ "getfh",
/* 396 */ "fhopen",
- /* 397 */ "fhstatvfs1",
+ /* 397 */ NULL, /* compat_90_netbsd32_fhstatvfs1 */
/* 398 */ NULL, /* compat_50_netbsd32___fhstat40 */
/* 399 */ NULL, /* unimplemented sys_aio_cancel */
/* 400 */ NULL, /* unimplemented sys_aio_error */
@@ -1064,10 +1064,10 @@ const char *const altnetbsd32_syscallnam
/* 480 */ "fdiscard",
/* 481 */ "wait6",
/* 482 */ "clock_getcpuclockid2",
- /* 483 */ NULL, /* filler */
- /* 484 */ NULL, /* filler */
- /* 485 */ NULL, /* filler */
- /* 486 */ NULL, /* filler */
+ /* 483 */ "getvfsstat",
+ /* 484 */ "statvfs1",
+ /* 485 */ "fstatvfs1",
+ /* 486 */ "fhstatvfs1",
/* 487 */ NULL, /* filler */
/* 488 */ NULL, /* filler */
/* 489 */ NULL, /* filler */
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.21 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.22
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.21 Tue Jun 18 12:24:32 2019
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Sun Sep 22 19:03:20 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.21 2019/06/18 16:24:32 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.22 2019/09/22 23:03:20 christos Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
+ * created from NetBSD: syscalls.master,v 1.128 2019/09/22 22:59:38 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.21 2019/06/18 16:24:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.22 2019/09/22 23:03:20 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -146,6 +146,9 @@ static struct sc_autoload netbsd32_sysca
{ NETBSD32_SYS_compat_50_netbsd32___shmctl13, "compat_netbsd32_sysvipc_50" },
{ NETBSD32_SYS_compat_50_netbsd32__lwp_park, "compat_netbsd32_50" },
{ NETBSD32_SYS_compat_50_netbsd32_kevent, "compat_netbsd32_50" },
+ { NETBSD32_SYS_compat_90_netbsd32_getvfsstat, "compat_netbsd32_90" },
+ { NETBSD32_SYS_compat_90_netbsd32_statvfs1, "compat_netbsd32_90" },
+ { NETBSD32_SYS_compat_90_netbsd32_fstatvfs1, "compat_netbsd32_90" },
{ NETBSD32_SYS_compat_30_netbsd32_fhstatvfs1, "compat_netbsd32_30" },
{ NETBSD32_SYS_compat_50_netbsd32_pselect, "compat_netbsd32_50" },
{ NETBSD32_SYS_compat_50_netbsd32_pollts, "compat_netbsd32_50" },
@@ -154,6 +157,7 @@ static struct sc_autoload netbsd32_sysca
{ NETBSD32_SYS_compat_50_netbsd32___lstat30, "compat_netbsd32_50" },
{ NETBSD32_SYS_compat_30_netbsd32___fhstat30, "compat_netbsd32_30" },
{ NETBSD32_SYS_compat_50_netbsd32_ntp_gettime, "compat_netbsd32_50" },
+ { NETBSD32_SYS_compat_90_netbsd32_fhstatvfs1, "compat_netbsd90" },
{ NETBSD32_SYS_compat_50_netbsd32___fhstat40, "compat_netbsd32_50" },
{ NETBSD32_SYS_netbsd32___mq_timedsend50, "compat_netbsd32_mqueue" },
{ NETBSD32_SYS_netbsd32___mq_timedreceive50, "compat_netbsd32_mqueue" },
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.140 src/sys/compat/netbsd32/netbsd32_sysent.c:1.141
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.140 Tue Jun 18 12:24:32 2019
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Sun Sep 22 19:03:20 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.140 2019/06/18 16:24:32 christos Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.141 2019/09/22 23:03:20 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
+ * created from NetBSD: syscalls.master,v 1.128 2019/09/22 22:59:38 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.140 2019/06/18 16:24:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.141 2019/09/22 23:03:20 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -121,6 +121,12 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys
#define compat_80(func) sys_nosys
#endif
+#ifdef COMPAT_90
+#define compat_90(func) __CONCAT(compat_90_,func)
+#else
+#define compat_90(func) sys_nosys
+#endif
+
#define s(type) sizeof(type)
#define n(type) (sizeof(type)/sizeof (register32_t))
#define ns(type) .sy_narg = n(type), .sy_argsize = s(type)
@@ -1489,17 +1495,17 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32_uuidgen
}, /* 355 = netbsd32_uuidgen */
{
- ns(struct netbsd32_getvfsstat_args),
- .sy_call = (sy_call_t *)netbsd32_getvfsstat
- }, /* 356 = netbsd32_getvfsstat */
- {
- ns(struct netbsd32_statvfs1_args),
- .sy_call = (sy_call_t *)netbsd32_statvfs1
- }, /* 357 = netbsd32_statvfs1 */
- {
- ns(struct netbsd32_fstatvfs1_args),
- .sy_call = (sy_call_t *)netbsd32_fstatvfs1
- }, /* 358 = netbsd32_fstatvfs1 */
+ ns(struct compat_90_netbsd32_getvfsstat_args),
+ .sy_call = (sy_call_t *)sys_nomodule
+ }, /* 356 = compat_90_netbsd32_getvfsstat */
+ {
+ ns(struct compat_90_netbsd32_statvfs1_args),
+ .sy_call = (sy_call_t *)sys_nomodule
+ }, /* 357 = compat_90_netbsd32_statvfs1 */
+ {
+ ns(struct compat_90_netbsd32_fstatvfs1_args),
+ .sy_call = (sy_call_t *)sys_nomodule
+ }, /* 358 = compat_90_netbsd32_fstatvfs1 */
{
ns(struct compat_30_netbsd32_fhstatvfs1_args),
.sy_call = (sy_call_t *)sys_nomodule
@@ -1652,9 +1658,9 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32___fhopen40
}, /* 396 = netbsd32___fhopen40 */
{
- ns(struct netbsd32___fhstatvfs140_args),
- .sy_call = (sy_call_t *)netbsd32___fhstatvfs140
- }, /* 397 = netbsd32___fhstatvfs140 */
+ ns(struct compat_90_netbsd32_fhstatvfs1_args),
+ .sy_call = (sy_call_t *)sys_nomodule
+ }, /* 397 = compat_90_netbsd32_fhstatvfs1 */
{
ns(struct compat_50_netbsd32___fhstat40_args),
.sy_call = (sy_call_t *)sys_nomodule
@@ -1999,17 +2005,21 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32_clock_getcpuclockid2
}, /* 482 = netbsd32_clock_getcpuclockid2 */
{
- .sy_call = sys_nosys,
- }, /* 483 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 484 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 485 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 486 = filler */
+ ns(struct netbsd32___getvfsstat90_args),
+ .sy_call = (sy_call_t *)netbsd32___getvfsstat90
+ }, /* 483 = netbsd32___getvfsstat90 */
+ {
+ ns(struct netbsd32___statvfs190_args),
+ .sy_call = (sy_call_t *)netbsd32___statvfs190
+ }, /* 484 = netbsd32___statvfs190 */
+ {
+ ns(struct netbsd32___fstatvfs190_args),
+ .sy_call = (sy_call_t *)netbsd32___fstatvfs190
+ }, /* 485 = netbsd32___fstatvfs190 */
+ {
+ ns(struct netbsd32___fhstatvfs190_args),
+ .sy_call = (sy_call_t *)netbsd32___fhstatvfs190
+ }, /* 486 = netbsd32___fhstatvfs190 */
{
.sy_call = sys_nosys,
}, /* 487 = filler */
@@ -2099,8 +2109,8 @@ const uint32_t netbsd32_sysent_nomodbits
0x01d107fe, /* syscalls 256-287 */
0x0000fc80, /* syscalls 288-319 */
0x02000001, /* syscalls 320-351 */
- 0x00600080, /* syscalls 352-383 */
- 0x00004338, /* syscalls 384-415 */
+ 0x006000f0, /* syscalls 352-383 */
+ 0x00006338, /* syscalls 384-415 */
0x1c070000, /* syscalls 416-447 */
0x00000000, /* syscalls 448-479 */
0x00000000, /* syscalls 480-511 */
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.32 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.33
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.32 Tue Jun 18 12:24:32 2019
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Sun Sep 22 19:03:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.32 2019/06/18 16:24:32 christos Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.33 2019/09/22 23:03:20 christos Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -2430,8 +2430,8 @@ systrace_args(register_t sysnum, const v
}
/* netbsd32_getvfsstat */
case 356: {
- const struct netbsd32_getvfsstat_args *p = params;
- uarg[0] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfsp_t */
+ const struct compat_90_netbsd32_getvfsstat_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfs90p_t */
iarg[1] = SCARG(p, bufsize); /* netbsd32_size_t */
iarg[2] = SCARG(p, flags); /* int */
*n_args = 3;
@@ -2439,18 +2439,18 @@ systrace_args(register_t sysnum, const v
}
/* netbsd32_statvfs1 */
case 357: {
- const struct netbsd32_statvfs1_args *p = params;
+ const struct compat_90_netbsd32_statvfs1_args *p = params;
uarg[0] = (intptr_t) SCARG(p, path).i32; /* netbsd32_charp */
- uarg[1] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfsp_t */
+ uarg[1] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfs90p_t */
iarg[2] = SCARG(p, flags); /* int */
*n_args = 3;
break;
}
/* netbsd32_fstatvfs1 */
case 358: {
- const struct netbsd32_fstatvfs1_args *p = params;
+ const struct compat_90_netbsd32_fstatvfs1_args *p = params;
iarg[0] = SCARG(p, fd); /* int */
- uarg[1] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfsp_t */
+ uarg[1] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfs90p_t */
iarg[2] = SCARG(p, flags); /* int */
*n_args = 3;
break;
@@ -2459,7 +2459,7 @@ systrace_args(register_t sysnum, const v
case 359: {
const struct compat_30_netbsd32_fhstatvfs1_args *p = params;
uarg[0] = (intptr_t) SCARG(p, fhp).i32; /* netbsd32_fhandlep_t */
- uarg[1] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfsp_t */
+ uarg[1] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfs90p_t */
iarg[2] = SCARG(p, flags); /* int */
*n_args = 3;
break;
@@ -2809,12 +2809,12 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
- /* netbsd32___fhstatvfs140 */
+ /* netbsd32_fhstatvfs1 */
case 397: {
- const struct netbsd32___fhstatvfs140_args *p = params;
+ const struct compat_90_netbsd32_fhstatvfs1_args *p = params;
uarg[0] = (intptr_t) SCARG(p, fhp).i32; /* netbsd32_pointer_t */
iarg[1] = SCARG(p, fh_size); /* netbsd32_size_t */
- uarg[2] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfsp_t */
+ uarg[2] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfs90p_t */
iarg[3] = SCARG(p, flags); /* int */
*n_args = 4;
break;
@@ -3492,6 +3492,43 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
+ /* netbsd32___getvfsstat90 */
+ case 483: {
+ const struct netbsd32___getvfsstat90_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfsp_t */
+ uarg[1] = SCARG(p, bufsize); /* size_t */
+ iarg[2] = SCARG(p, flags); /* int */
+ *n_args = 3;
+ break;
+ }
+ /* netbsd32___statvfs190 */
+ case 484: {
+ const struct netbsd32___statvfs190_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, path).i32; /* netbsd32_charp */
+ uarg[1] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfsp_t */
+ iarg[2] = SCARG(p, flags); /* int */
+ *n_args = 3;
+ break;
+ }
+ /* netbsd32___fstatvfs190 */
+ case 485: {
+ const struct netbsd32___fstatvfs190_args *p = params;
+ iarg[0] = SCARG(p, fd); /* int */
+ uarg[1] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfsp_t */
+ iarg[2] = SCARG(p, flags); /* int */
+ *n_args = 3;
+ break;
+ }
+ /* netbsd32___fhstatvfs190 */
+ case 486: {
+ const struct netbsd32___fhstatvfs190_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, fhp).i32; /* netbsd32_voidp */
+ uarg[1] = SCARG(p, fh_size); /* size_t */
+ uarg[2] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_statvfsp_t */
+ iarg[3] = SCARG(p, flags); /* int */
+ *n_args = 4;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -7482,7 +7519,7 @@ systrace_entry_setargdesc(int sysnum, in
case 356:
switch(ndx) {
case 0:
- p = "netbsd32_statvfsp_t";
+ p = "netbsd32_statvfs90p_t";
break;
case 1:
p = "netbsd32_size_t";
@@ -7501,7 +7538,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "netbsd32_charp";
break;
case 1:
- p = "netbsd32_statvfsp_t";
+ p = "netbsd32_statvfs90p_t";
break;
case 2:
p = "int";
@@ -7517,7 +7554,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "int";
break;
case 1:
- p = "netbsd32_statvfsp_t";
+ p = "netbsd32_statvfs90p_t";
break;
case 2:
p = "int";
@@ -7533,7 +7570,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "netbsd32_fhandlep_t";
break;
case 1:
- p = "netbsd32_statvfsp_t";
+ p = "netbsd32_statvfs90p_t";
break;
case 2:
p = "int";
@@ -8181,7 +8218,7 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* netbsd32___fhstatvfs140 */
+ /* netbsd32_fhstatvfs1 */
case 397:
switch(ndx) {
case 0:
@@ -8191,7 +8228,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "netbsd32_size_t";
break;
case 2:
- p = "netbsd32_statvfsp_t";
+ p = "netbsd32_statvfs90p_t";
break;
case 3:
p = "int";
@@ -9426,6 +9463,73 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+ /* netbsd32___getvfsstat90 */
+ case 483:
+ switch(ndx) {
+ case 0:
+ p = "netbsd32_statvfsp_t";
+ break;
+ case 1:
+ p = "size_t";
+ break;
+ case 2:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* netbsd32___statvfs190 */
+ case 484:
+ switch(ndx) {
+ case 0:
+ p = "netbsd32_charp";
+ break;
+ case 1:
+ p = "netbsd32_statvfsp_t";
+ break;
+ case 2:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* netbsd32___fstatvfs190 */
+ case 485:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "netbsd32_statvfsp_t";
+ break;
+ case 2:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* netbsd32___fhstatvfs190 */
+ case 486:
+ switch(ndx) {
+ case 0:
+ p = "netbsd32_voidp";
+ break;
+ case 1:
+ p = "size_t";
+ break;
+ case 2:
+ p = "netbsd32_statvfsp_t";
+ break;
+ case 3:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -11035,7 +11139,7 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* netbsd32___fhstatvfs140 */
+ /* netbsd32_fhstatvfs1 */
case 397:
if (ndx == 0 || ndx == 1)
p = "int";
@@ -11401,6 +11505,26 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* netbsd32___getvfsstat90 */
+ case 483:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* netbsd32___statvfs190 */
+ case 484:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* netbsd32___fstatvfs190 */
+ case 485:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* netbsd32___fhstatvfs190 */
+ case 486:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
Index: src/sys/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.324 src/sys/kern/init_sysent.c:1.325
--- src/sys/kern/init_sysent.c:1.324 Sun Sep 22 18:59:39 2019
+++ src/sys/kern/init_sysent.c Sun Sep 22 19:03:20 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.324 2019/09/22 22:59:39 christos Exp $ */
+/* $NetBSD: init_sysent.c,v 1.325 2019/09/22 23:03:20 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.295 2019/06/18 16:06:45 christos Exp
+ * created from NetBSD: syscalls.master,v 1.296 2019/09/22 22:59:39 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.324 2019/09/22 22:59:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.325 2019/09/22 23:03:20 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.313 src/sys/kern/syscalls.c:1.314
--- src/sys/kern/syscalls.c:1.313 Fri Aug 10 17:47:16 2018
+++ src/sys/kern/syscalls.c Sun Sep 22 19:03:20 2019
@@ -1,19 +1,21 @@
-/* $NetBSD: syscalls.c,v 1.313 2018/08/10 21:47:16 pgoyette Exp $ */
+/* $NetBSD: syscalls.c,v 1.314 2019/09/22 23:03:20 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp
+ * created from NetBSD: syscalls.master,v 1.296 2019/09/22 22:59:39 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.313 2018/08/10 21:47:16 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.314 2019/09/22 23:03:20 christos Exp $");
#if defined(_KERNEL_OPT)
+#ifdef _KERNEL_OPT
#include "opt_modular.h"
#include "opt_ntp.h"
#include "opt_sysv.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/signal.h>
@@ -399,9 +401,9 @@ const char *const syscallnames[] = {
/* 353 */ "#353 (unimplemented)",
/* 354 */ "fsync_range",
/* 355 */ "uuidgen",
- /* 356 */ "getvfsstat",
- /* 357 */ "statvfs1",
- /* 358 */ "fstatvfs1",
+ /* 356 */ "compat_90_getvfsstat",
+ /* 357 */ "compat_90_statvfs1",
+ /* 358 */ "compat_90_fstatvfs1",
/* 359 */ "compat_30_fhstatvfs1",
/* 360 */ "extattrctl",
/* 361 */ "extattr_set_file",
@@ -440,7 +442,7 @@ const char *const syscallnames[] = {
/* 394 */ "__socket30",
/* 395 */ "__getfh30",
/* 396 */ "__fhopen40",
- /* 397 */ "__fhstatvfs140",
+ /* 397 */ "compat_90_fhstatvfs1",
/* 398 */ "compat_50___fhstat40",
/* 399 */ "aio_cancel",
/* 400 */ "aio_error",
@@ -530,10 +532,10 @@ const char *const syscallnames[] = {
/* 480 */ "fdiscard",
/* 481 */ "wait6",
/* 482 */ "clock_getcpuclockid2",
- /* 483 */ "# filler",
- /* 484 */ "# filler",
- /* 485 */ "# filler",
- /* 486 */ "# filler",
+ /* 483 */ "__getvfsstat90",
+ /* 484 */ "__statvfs190",
+ /* 485 */ "__fstatvfs190",
+ /* 486 */ "__fhstatvfs190",
/* 487 */ "# filler",
/* 488 */ "# filler",
/* 489 */ "# filler",
@@ -936,9 +938,9 @@ const char *const altsyscallnames[] = {
/* 353 */ NULL, /* unimplemented */
/* 354 */ NULL, /* fsync_range */
/* 355 */ NULL, /* uuidgen */
- /* 356 */ NULL, /* getvfsstat */
- /* 357 */ NULL, /* statvfs1 */
- /* 358 */ NULL, /* fstatvfs1 */
+ /* 356 */ NULL, /* compat_90_getvfsstat */
+ /* 357 */ NULL, /* compat_90_statvfs1 */
+ /* 358 */ NULL, /* compat_90_fstatvfs1 */
/* 359 */ NULL, /* compat_30_fhstatvfs1 */
/* 360 */ NULL, /* extattrctl */
/* 361 */ NULL, /* extattr_set_file */
@@ -977,7 +979,7 @@ const char *const altsyscallnames[] = {
/* 394 */ "socket",
/* 395 */ "getfh",
/* 396 */ "fhopen",
- /* 397 */ "fhstatvfs1",
+ /* 397 */ NULL, /* compat_90_fhstatvfs1 */
/* 398 */ NULL, /* compat_50___fhstat40 */
/* 399 */ NULL, /* aio_cancel */
/* 400 */ NULL, /* aio_error */
@@ -1067,10 +1069,10 @@ const char *const altsyscallnames[] = {
/* 480 */ NULL, /* fdiscard */
/* 481 */ NULL, /* wait6 */
/* 482 */ NULL, /* clock_getcpuclockid2 */
- /* 483 */ NULL, /* filler */
- /* 484 */ NULL, /* filler */
- /* 485 */ NULL, /* filler */
- /* 486 */ NULL, /* filler */
+ /* 483 */ "getvfsstat",
+ /* 484 */ "statvfs1",
+ /* 485 */ "fstatvfs1",
+ /* 486 */ "fhstatvfs1",
/* 487 */ NULL, /* filler */
/* 488 */ NULL, /* filler */
/* 489 */ NULL, /* filler */
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.30 src/sys/kern/syscalls_autoload.c:1.31
--- src/sys/kern/syscalls_autoload.c:1.30 Sat Jan 26 21:08:43 2019
+++ src/sys/kern/syscalls_autoload.c Sun Sep 22 19:03:20 2019
@@ -1,16 +1,28 @@
-/* $NetBSD: syscalls_autoload.c,v 1.30 2019/01/27 02:08:43 pgoyette Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.31 2019/09/22 23:03:20 christos Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp
+ * created from NetBSD: syscalls.master,v 1.296 2019/09/22 22:59:39 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.30 2019/01/27 02:08:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.31 2019/09/22 23:03:20 christos Exp $");
-#include <sys/proc.h>
+#ifdef _KERNEL_OPT
+#include "opt_modular.h"
+#include "opt_ntp.h"
+#include "opt_sysv.h"
+#endif
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/mount.h>
+#include <sys/sched.h>
+#include <sys/idtype.h>
+#include <sys/syscallargs.h>
static struct sc_autoload netbsd_syscalls_autoload[] = {
{ SYS_compat_50_wait4, "compat_50" },
{ SYS_compat_43_ocreat, "compat_43" },
@@ -65,7 +77,7 @@ static struct sc_autoload netbsd_syscall
{ SYS_compat_43_ogetrlimit, "compat_43" },
{ SYS_compat_43_osetrlimit, "compat_43" },
{ SYS_compat_43_okillpg, "compat_43" },
- { SYS_compat_50_quotactl, "XXX" },
+ { SYS_compat_50_quotactl, "compat_50" },
{ SYS_compat_43_oquota, "compat_43" },
{ SYS_compat_43_ogetsockname, "compat_43" },
{ SYS_nfssvc, "nfsserver" },
@@ -89,6 +101,9 @@ static struct sc_autoload netbsd_syscall
#else
#endif
{ SYS_compat_30_ntp_gettime, "compat_30" },
+#if defined(NTP) || !defined(_KERNEL_OPT)
+#else
+#endif
{ SYS_lfs_bmapv, "lfs" },
{ SYS_lfs_markv, "lfs" },
{ SYS_lfs_segclean, "lfs" },
@@ -159,6 +174,9 @@ static struct sc_autoload netbsd_syscall
{ SYS_compat_60_sa_yield, "compat_60" },
{ SYS_compat_60_sa_preempt, "compat_60" },
{ SYS_compat_50_kevent, "compat_50" },
+ { SYS_compat_90_getvfsstat, "compat_90" },
+ { SYS_compat_90_statvfs1, "compat_90" },
+ { SYS_compat_90_fstatvfs1, "compat_90" },
{ SYS_compat_30_fhstatvfs1, "compat_30" },
{ SYS_compat_50_pselect, "compat_50" },
{ SYS_compat_50_pollts, "compat_50" },
@@ -167,6 +185,7 @@ static struct sc_autoload netbsd_syscall
{ SYS_compat_50___lstat30, "compat_50" },
{ SYS_compat_30___fhstat30, "compat_30" },
{ SYS_compat_50___ntp_gettime30, "compat_30" },
+ { SYS_compat_90_fhstatvfs1, "compat_90" },
{ SYS_compat_50___fhstat40, "compat_50" },
{ SYS_aio_cancel, "aio" },
{ SYS_aio_error, "aio" },
@@ -184,5 +203,8 @@ static struct sc_autoload netbsd_syscall
{ SYS_____semctl50, "sysv_ipc" },
{ SYS___shmctl50, "sysv_ipc" },
{ SYS___msgctl50, "sysv_ipc" },
+#if defined(NTP) || !defined(_KERNEL_OPT)
+#else
+#endif
{ 0, NULL }
};
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.32 src/sys/kern/systrace_args.c:1.33
--- src/sys/kern/systrace_args.c:1.32 Fri Aug 10 17:47:16 2018
+++ src/sys/kern/systrace_args.c Sun Sep 22 19:03:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.32 2018/08/10 21:47:16 pgoyette Exp $ */
+/* $NetBSD: systrace_args.c,v 1.33 2019/09/22 23:03:20 christos Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -2525,8 +2525,8 @@ systrace_args(register_t sysnum, const v
}
/* sys_getvfsstat */
case 356: {
- const struct sys_getvfsstat_args *p = params;
- uarg[0] = (intptr_t) SCARG(p, buf); /* struct statvfs * */
+ const struct compat_90_sys_getvfsstat_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, buf); /* struct statvfs90 * */
uarg[1] = SCARG(p, bufsize); /* size_t */
iarg[2] = SCARG(p, flags); /* int */
*n_args = 3;
@@ -2534,18 +2534,18 @@ systrace_args(register_t sysnum, const v
}
/* sys_statvfs1 */
case 357: {
- const struct sys_statvfs1_args *p = params;
+ const struct compat_90_sys_statvfs1_args *p = params;
uarg[0] = (intptr_t) SCARG(p, path); /* const char * */
- uarg[1] = (intptr_t) SCARG(p, buf); /* struct statvfs * */
+ uarg[1] = (intptr_t) SCARG(p, buf); /* struct statvfs90 * */
iarg[2] = SCARG(p, flags); /* int */
*n_args = 3;
break;
}
/* sys_fstatvfs1 */
case 358: {
- const struct sys_fstatvfs1_args *p = params;
+ const struct compat_90_sys_fstatvfs1_args *p = params;
iarg[0] = SCARG(p, fd); /* int */
- uarg[1] = (intptr_t) SCARG(p, buf); /* struct statvfs * */
+ uarg[1] = (intptr_t) SCARG(p, buf); /* struct statvfs90 * */
iarg[2] = SCARG(p, flags); /* int */
*n_args = 3;
break;
@@ -2554,7 +2554,7 @@ systrace_args(register_t sysnum, const v
case 359: {
const struct compat_30_sys_fhstatvfs1_args *p = params;
uarg[0] = (intptr_t) SCARG(p, fhp); /* const struct compat_30_fhandle * */
- uarg[1] = (intptr_t) SCARG(p, buf); /* struct statvfs * */
+ uarg[1] = (intptr_t) SCARG(p, buf); /* struct statvfs90 * */
iarg[2] = SCARG(p, flags); /* int */
*n_args = 3;
break;
@@ -2904,12 +2904,12 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
- /* sys___fhstatvfs140 */
+ /* sys_fhstatvfs1 */
case 397: {
- const struct sys___fhstatvfs140_args *p = params;
+ const struct compat_90_sys_fhstatvfs1_args *p = params;
uarg[0] = (intptr_t) SCARG(p, fhp); /* const void * */
uarg[1] = SCARG(p, fh_size); /* size_t */
- uarg[2] = (intptr_t) SCARG(p, buf); /* struct statvfs * */
+ uarg[2] = (intptr_t) SCARG(p, buf); /* struct statvfs90 * */
iarg[3] = SCARG(p, flags); /* int */
*n_args = 4;
break;
@@ -3664,6 +3664,43 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
+ /* sys___getvfsstat90 */
+ case 483: {
+ const struct sys___getvfsstat90_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, buf); /* struct statvfs * */
+ uarg[1] = SCARG(p, bufsize); /* size_t */
+ iarg[2] = SCARG(p, flags); /* int */
+ *n_args = 3;
+ break;
+ }
+ /* sys___statvfs190 */
+ case 484: {
+ const struct sys___statvfs190_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, path); /* const char * */
+ uarg[1] = (intptr_t) SCARG(p, buf); /* struct statvfs * */
+ iarg[2] = SCARG(p, flags); /* int */
+ *n_args = 3;
+ break;
+ }
+ /* sys___fstatvfs190 */
+ case 485: {
+ const struct sys___fstatvfs190_args *p = params;
+ iarg[0] = SCARG(p, fd); /* int */
+ uarg[1] = (intptr_t) SCARG(p, buf); /* struct statvfs * */
+ iarg[2] = SCARG(p, flags); /* int */
+ *n_args = 3;
+ break;
+ }
+ /* sys___fhstatvfs190 */
+ case 486: {
+ const struct sys___fhstatvfs190_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, fhp); /* const void * */
+ uarg[1] = SCARG(p, fh_size); /* size_t */
+ uarg[2] = (intptr_t) SCARG(p, buf); /* struct statvfs * */
+ iarg[3] = SCARG(p, flags); /* int */
+ *n_args = 4;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -7804,7 +7841,7 @@ systrace_entry_setargdesc(int sysnum, in
case 356:
switch(ndx) {
case 0:
- p = "struct statvfs *";
+ p = "struct statvfs90 *";
break;
case 1:
p = "size_t";
@@ -7823,7 +7860,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "const char *";
break;
case 1:
- p = "struct statvfs *";
+ p = "struct statvfs90 *";
break;
case 2:
p = "int";
@@ -7839,7 +7876,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "int";
break;
case 1:
- p = "struct statvfs *";
+ p = "struct statvfs90 *";
break;
case 2:
p = "int";
@@ -7855,7 +7892,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "const struct compat_30_fhandle *";
break;
case 1:
- p = "struct statvfs *";
+ p = "struct statvfs90 *";
break;
case 2:
p = "int";
@@ -8503,7 +8540,7 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* sys___fhstatvfs140 */
+ /* sys_fhstatvfs1 */
case 397:
switch(ndx) {
case 0:
@@ -8513,7 +8550,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "size_t";
break;
case 2:
- p = "struct statvfs *";
+ p = "struct statvfs90 *";
break;
case 3:
p = "int";
@@ -9875,6 +9912,73 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+ /* sys___getvfsstat90 */
+ case 483:
+ switch(ndx) {
+ case 0:
+ p = "struct statvfs *";
+ break;
+ case 1:
+ p = "size_t";
+ break;
+ case 2:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* sys___statvfs190 */
+ case 484:
+ switch(ndx) {
+ case 0:
+ p = "const char *";
+ break;
+ case 1:
+ p = "struct statvfs *";
+ break;
+ case 2:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* sys___fstatvfs190 */
+ case 485:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "struct statvfs *";
+ break;
+ case 2:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* sys___fhstatvfs190 */
+ case 486:
+ switch(ndx) {
+ case 0:
+ p = "const void *";
+ break;
+ case 1:
+ p = "size_t";
+ break;
+ case 2:
+ p = "struct statvfs *";
+ break;
+ case 3:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -11539,7 +11643,7 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* sys___fhstatvfs140 */
+ /* sys_fhstatvfs1 */
case 397:
if (ndx == 0 || ndx == 1)
p = "int";
@@ -11952,6 +12056,26 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* sys___getvfsstat90 */
+ case 483:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* sys___statvfs190 */
+ case 484:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* sys___fstatvfs190 */
+ case 485:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* sys___fhstatvfs190 */
+ case 486:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
Index: src/sys/rump/rump.sysmap
diff -u src/sys/rump/rump.sysmap:1.5 src/sys/rump/rump.sysmap:1.6
--- src/sys/rump/rump.sysmap:1.5 Fri Aug 10 17:47:16 2018
+++ src/sys/rump/rump.sysmap Sun Sep 22 19:03:20 2019
@@ -120,9 +120,6 @@
344 sys_kqueue kqueue rump___sysimpl_kqueue
345 sys_nomodule kevent rump___sysimpl_kevent
354 sys_fsync_range fsync_range rump___sysimpl_fsync_range
-356 sys_getvfsstat getvfsstat rump___sysimpl_getvfsstat
-357 sys_statvfs1 statvfs1 rump___sysimpl_statvfs1
-358 sys_fstatvfs1 fstatvfs1 rump___sysimpl_fstatvfs1
360 sys_extattrctl extattrctl rump___sysimpl_extattrctl
361 sys_extattr_set_file extattr_set_file rump___sysimpl_extattr_set_file
362 sys_extattr_get_file extattr_get_file rump___sysimpl_extattr_get_file
@@ -157,7 +154,6 @@
394 sys___socket30 __socket30 rump___sysimpl_socket30
395 sys___getfh30 __getfh30 rump___sysimpl_getfh30
396 sys___fhopen40 __fhopen40 rump___sysimpl_fhopen40
-397 sys___fhstatvfs140 __fhstatvfs140 rump___sysimpl_fhstatvfs140
398 sys_nomodule __fhstat40 rump___sysimpl_fhstat40
399 sys_nomodule aio_cancel rump___sysimpl_aio_cancel
400 sys_nomodule aio_error rump___sysimpl_aio_error
@@ -217,3 +213,7 @@
477 sys_clock_nanosleep clock_nanosleep rump___sysimpl_clock_nanosleep
479 sys_posix_fallocate posix_fallocate rump___sysimpl_posix_fallocate
480 sys_fdiscard fdiscard rump___sysimpl_fdiscard
+483 sys___getvfsstat90 __getvfsstat90 rump___sysimpl_getvfsstat90
+484 sys___statvfs190 __statvfs190 rump___sysimpl_statvfs190
+485 sys___fstatvfs190 __fstatvfs190 rump___sysimpl_fstatvfs190
+486 sys___fhstatvfs190 __fhstatvfs190 rump___sysimpl_fhstatvfs190
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.111 src/sys/rump/include/rump/rump_syscalls.h:1.112
--- src/sys/rump/include/rump/rump_syscalls.h:1.111 Fri Aug 10 17:47:16 2018
+++ src/sys/rump/include/rump/rump_syscalls.h Sun Sep 22 19:03:20 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.111 2018/08/10 21:47:16 pgoyette Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.112 2019/09/22 23:03:20 christos Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp
+ * created from NetBSD: syscalls.master,v 1.296 2019/09/22 22:59:39 christos Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -44,12 +44,12 @@
#define RUMP_SYS_RENAME_SENDTO rump___sysimpl_sendto
#endif
-#ifndef RUMP_SYS_RENAME_ADJTIME
-#define RUMP_SYS_RENAME_ADJTIME rump___sysimpl_adjtime50
+#ifndef RUMP_SYS_RENAME_FHSTATVFS1
+#define RUMP_SYS_RENAME_FHSTATVFS1 rump___sysimpl_fhstatvfs190
#endif
-#ifndef RUMP_SYS_RENAME_FHSTATVFS1
-#define RUMP_SYS_RENAME_FHSTATVFS1 rump___sysimpl_fhstatvfs140
+#ifndef RUMP_SYS_RENAME_ADJTIME
+#define RUMP_SYS_RENAME_ADJTIME rump___sysimpl_adjtime50
#endif
#ifndef RUMP_SYS_RENAME_TIMER_DELETE
@@ -97,7 +97,7 @@
#endif
#ifndef RUMP_SYS_RENAME_GETVFSSTAT
-#define RUMP_SYS_RENAME_GETVFSSTAT rump___sysimpl_getvfsstat
+#define RUMP_SYS_RENAME_GETVFSSTAT rump___sysimpl_getvfsstat90
#endif
#ifndef RUMP_SYS_RENAME_FLOCK
@@ -277,7 +277,7 @@
#endif
#ifndef RUMP_SYS_RENAME_FSTATVFS1
-#define RUMP_SYS_RENAME_FSTATVFS1 rump___sysimpl_fstatvfs1
+#define RUMP_SYS_RENAME_FSTATVFS1 rump___sysimpl_fstatvfs190
#endif
#ifndef RUMP_SYS_RENAME_UTRACE
@@ -689,7 +689,7 @@
#endif
#ifndef RUMP_SYS_RENAME_STATVFS1
-#define RUMP_SYS_RENAME_STATVFS1 rump___sysimpl_statvfs1
+#define RUMP_SYS_RENAME_STATVFS1 rump___sysimpl_statvfs190
#endif
#ifndef RUMP_SYS_RENAME_STAT
@@ -849,13 +849,13 @@ struct pollfd;
struct sigevent;
struct timespec;
struct kevent;
-struct statvfs;
struct stat;
struct aiocb;
struct itimerval;
struct itimerspec;
struct quotactl_args;
struct mmsghdr;
+struct statvfs;
ssize_t rump_sys_read(int, void *, size_t) __RENAME(RUMP_SYS_RENAME_READ);
ssize_t rump_sys_write(int, const void *, size_t) __RENAME(RUMP_SYS_RENAME_WRITE);
@@ -977,9 +977,6 @@ int rump_sys_utrace(const char *, void *
int rump_sys_kqueue(void) __RENAME(RUMP_SYS_RENAME_KQUEUE);
int rump_sys_kevent(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *) __RENAME(RUMP_SYS_RENAME_KEVENT);
int rump_sys_fsync_range(int, int, off_t, off_t) __RENAME(RUMP_SYS_RENAME_FSYNC_RANGE);
-int rump_sys_getvfsstat(struct statvfs *, size_t, int) __RENAME(RUMP_SYS_RENAME_GETVFSSTAT);
-int rump_sys_statvfs1(const char *, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_STATVFS1);
-int rump_sys_fstatvfs1(int, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_FSTATVFS1);
int rump_sys_extattrctl(const char *, int, const char *, int, const char *) __RENAME(RUMP_SYS_RENAME_EXTATTRCTL);
int rump_sys_extattr_set_file(const char *, int, const char *, const void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_SET_FILE);
ssize_t rump_sys_extattr_get_file(const char *, int, const char *, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_GET_FILE);
@@ -1014,7 +1011,6 @@ int rump_sys_getdents(int, char *, size_
int rump_sys_socket(int, int, int) __RENAME(RUMP_SYS_RENAME_SOCKET);
int rump_sys_getfh(const char *, void *, size_t *) __RENAME(RUMP_SYS_RENAME_GETFH);
int rump_sys_fhopen(const void *, size_t, int) __RENAME(RUMP_SYS_RENAME_FHOPEN);
-int rump_sys_fhstatvfs1(const void *, size_t, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_FHSTATVFS1);
int rump_sys_fhstat(const void *, size_t, struct stat *) __RENAME(RUMP_SYS_RENAME_FHSTAT);
int rump_sys_aio_cancel(int, struct aiocb *) __RENAME(RUMP_SYS_RENAME_AIO_CANCEL);
int rump_sys_aio_error(const struct aiocb *) __RENAME(RUMP_SYS_RENAME_AIO_ERROR);
@@ -1063,6 +1059,10 @@ int rump_sys_sendmmsg(int, struct mmsghd
int rump_sys_clock_nanosleep(clockid_t, int, const struct timespec *, struct timespec *) __RENAME(RUMP_SYS_RENAME_CLOCK_NANOSLEEP);
int rump_sys_posix_fallocate(int, off_t, off_t) __RENAME(RUMP_SYS_RENAME_POSIX_FALLOCATE);
int rump_sys_fdiscard(int, off_t, off_t) __RENAME(RUMP_SYS_RENAME_FDISCARD);
+int rump_sys_getvfsstat(struct statvfs *, size_t, int) __RENAME(RUMP_SYS_RENAME_GETVFSSTAT);
+int rump_sys_statvfs1(const char *, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_STATVFS1);
+int rump_sys_fstatvfs1(int, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_FSTATVFS1);
+int rump_sys_fhstatvfs1(const void *, size_t, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_FHSTATVFS1);
int rump_sys_pipe(int *);
#endif /* _RUMP_RUMP_SYSCALLS_H_ */
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.141 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.142
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.141 Sat Jan 26 21:08:49 2019
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Sun Sep 22 19:03:21 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.141 2019/01/27 02:08:49 pgoyette Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.142 2019/09/22 23:03:21 christos Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp
+ * created from NetBSD: syscalls.master,v 1.296 2019/09/22 22:59:39 christos Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.141 2019/01/27 02:08:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.142 2019/09/22 23:03:21 christos Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -3544,96 +3544,6 @@ __weak_alias(_fsync_range,rump___sysimpl
__strong_alias(_sys_fsync_range,rump___sysimpl_fsync_range);
#endif /* RUMP_KERNEL_IS_LIBC */
-int rump___sysimpl_getvfsstat(struct statvfs *, size_t, int);
-int
-rump___sysimpl_getvfsstat(struct statvfs * buf, size_t bufsize, int flags)
-{
- register_t retval[2];
- int error = 0;
- int rv = -1;
- struct sys_getvfsstat_args callarg;
-
- memset(&callarg, 0, sizeof(callarg));
- SPARG(&callarg, buf) = buf;
- SPARG(&callarg, bufsize) = bufsize;
- SPARG(&callarg, flags) = flags;
-
- error = rsys_syscall(SYS_getvfsstat, &callarg, sizeof(callarg), retval);
- rsys_seterrno(error);
- if (error == 0) {
- if (sizeof(int) > sizeof(register_t))
- rv = *(int *)retval;
- else
- rv = *retval;
- }
- return rv;
-}
-#ifdef RUMP_KERNEL_IS_LIBC
-__weak_alias(getvfsstat,rump___sysimpl_getvfsstat);
-__weak_alias(_getvfsstat,rump___sysimpl_getvfsstat);
-__strong_alias(_sys_getvfsstat,rump___sysimpl_getvfsstat);
-#endif /* RUMP_KERNEL_IS_LIBC */
-
-int rump___sysimpl_statvfs1(const char *, struct statvfs *, int);
-int
-rump___sysimpl_statvfs1(const char * path, struct statvfs * buf, int flags)
-{
- register_t retval[2];
- int error = 0;
- int rv = -1;
- struct sys_statvfs1_args callarg;
-
- memset(&callarg, 0, sizeof(callarg));
- SPARG(&callarg, path) = path;
- SPARG(&callarg, buf) = buf;
- SPARG(&callarg, flags) = flags;
-
- error = rsys_syscall(SYS_statvfs1, &callarg, sizeof(callarg), retval);
- rsys_seterrno(error);
- if (error == 0) {
- if (sizeof(int) > sizeof(register_t))
- rv = *(int *)retval;
- else
- rv = *retval;
- }
- return rv;
-}
-#ifdef RUMP_KERNEL_IS_LIBC
-__weak_alias(statvfs1,rump___sysimpl_statvfs1);
-__weak_alias(_statvfs1,rump___sysimpl_statvfs1);
-__strong_alias(_sys_statvfs1,rump___sysimpl_statvfs1);
-#endif /* RUMP_KERNEL_IS_LIBC */
-
-int rump___sysimpl_fstatvfs1(int, struct statvfs *, int);
-int
-rump___sysimpl_fstatvfs1(int fd, struct statvfs * buf, int flags)
-{
- register_t retval[2];
- int error = 0;
- int rv = -1;
- struct sys_fstatvfs1_args callarg;
-
- memset(&callarg, 0, sizeof(callarg));
- SPARG(&callarg, fd) = fd;
- SPARG(&callarg, buf) = buf;
- SPARG(&callarg, flags) = flags;
-
- error = rsys_syscall(SYS_fstatvfs1, &callarg, sizeof(callarg), retval);
- rsys_seterrno(error);
- if (error == 0) {
- if (sizeof(int) > sizeof(register_t))
- rv = *(int *)retval;
- else
- rv = *retval;
- }
- return rv;
-}
-#ifdef RUMP_KERNEL_IS_LIBC
-__weak_alias(fstatvfs1,rump___sysimpl_fstatvfs1);
-__weak_alias(_fstatvfs1,rump___sysimpl_fstatvfs1);
-__strong_alias(_sys_fstatvfs1,rump___sysimpl_fstatvfs1);
-#endif /* RUMP_KERNEL_IS_LIBC */
-
int rump___sysimpl_extattrctl(const char *, int, const char *, int, const char *);
int
rump___sysimpl_extattrctl(const char * path, int cmd, const char * filename, int attrnamespace, const char * attrname)
@@ -4695,38 +4605,6 @@ __weak_alias(___fhopen40,rump___sysimpl_
__strong_alias(_sys___fhopen40,rump___sysimpl_fhopen40);
#endif /* RUMP_KERNEL_IS_LIBC */
-int rump___sysimpl_fhstatvfs140(const void *, size_t, struct statvfs *, int);
-int
-rump___sysimpl_fhstatvfs140(const void * fhp, size_t fh_size, struct statvfs * buf, int flags)
-{
- register_t retval[2];
- int error = 0;
- int rv = -1;
- struct sys___fhstatvfs140_args callarg;
-
- memset(&callarg, 0, sizeof(callarg));
- SPARG(&callarg, fhp) = fhp;
- SPARG(&callarg, fh_size) = fh_size;
- SPARG(&callarg, buf) = buf;
- SPARG(&callarg, flags) = flags;
-
- error = rsys_syscall(SYS___fhstatvfs140, &callarg, sizeof(callarg), retval);
- rsys_seterrno(error);
- if (error == 0) {
- if (sizeof(int) > sizeof(register_t))
- rv = *(int *)retval;
- else
- rv = *retval;
- }
- return rv;
-}
-#ifdef RUMP_KERNEL_IS_LIBC
-__weak_alias(fhstatvfs1,rump___sysimpl_fhstatvfs140);
-__weak_alias(__fhstatvfs140,rump___sysimpl_fhstatvfs140);
-__weak_alias(___fhstatvfs140,rump___sysimpl_fhstatvfs140);
-__strong_alias(_sys___fhstatvfs140,rump___sysimpl_fhstatvfs140);
-#endif /* RUMP_KERNEL_IS_LIBC */
-
#ifdef RUMP_SYS_COMPAT
int rump___sysimpl_fhstat40(const void *, size_t, struct stat *);
int
@@ -6520,6 +6398,131 @@ __weak_alias(_fdiscard,rump___sysimpl_fd
__strong_alias(_sys_fdiscard,rump___sysimpl_fdiscard);
#endif /* RUMP_KERNEL_IS_LIBC */
+int rump___sysimpl_getvfsstat90(struct statvfs *, size_t, int);
+int
+rump___sysimpl_getvfsstat90(struct statvfs * buf, size_t bufsize, int flags)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___getvfsstat90_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, buf) = buf;
+ SPARG(&callarg, bufsize) = bufsize;
+ SPARG(&callarg, flags) = flags;
+
+ error = rsys_syscall(SYS___getvfsstat90, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+#ifdef RUMP_KERNEL_IS_LIBC
+__weak_alias(getvfsstat,rump___sysimpl_getvfsstat90);
+__weak_alias(__getvfsstat90,rump___sysimpl_getvfsstat90);
+__weak_alias(___getvfsstat90,rump___sysimpl_getvfsstat90);
+__strong_alias(_sys___getvfsstat90,rump___sysimpl_getvfsstat90);
+#endif /* RUMP_KERNEL_IS_LIBC */
+
+int rump___sysimpl_statvfs190(const char *, struct statvfs *, int);
+int
+rump___sysimpl_statvfs190(const char * path, struct statvfs * buf, int flags)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___statvfs190_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, path) = path;
+ SPARG(&callarg, buf) = buf;
+ SPARG(&callarg, flags) = flags;
+
+ error = rsys_syscall(SYS___statvfs190, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+#ifdef RUMP_KERNEL_IS_LIBC
+__weak_alias(statvfs1,rump___sysimpl_statvfs190);
+__weak_alias(__statvfs190,rump___sysimpl_statvfs190);
+__weak_alias(___statvfs190,rump___sysimpl_statvfs190);
+__strong_alias(_sys___statvfs190,rump___sysimpl_statvfs190);
+#endif /* RUMP_KERNEL_IS_LIBC */
+
+int rump___sysimpl_fstatvfs190(int, struct statvfs *, int);
+int
+rump___sysimpl_fstatvfs190(int fd, struct statvfs * buf, int flags)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___fstatvfs190_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, fd) = fd;
+ SPARG(&callarg, buf) = buf;
+ SPARG(&callarg, flags) = flags;
+
+ error = rsys_syscall(SYS___fstatvfs190, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+#ifdef RUMP_KERNEL_IS_LIBC
+__weak_alias(fstatvfs1,rump___sysimpl_fstatvfs190);
+__weak_alias(__fstatvfs190,rump___sysimpl_fstatvfs190);
+__weak_alias(___fstatvfs190,rump___sysimpl_fstatvfs190);
+__strong_alias(_sys___fstatvfs190,rump___sysimpl_fstatvfs190);
+#endif /* RUMP_KERNEL_IS_LIBC */
+
+int rump___sysimpl_fhstatvfs190(const void *, size_t, struct statvfs *, int);
+int
+rump___sysimpl_fhstatvfs190(const void * fhp, size_t fh_size, struct statvfs * buf, int flags)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___fhstatvfs190_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, fhp) = fhp;
+ SPARG(&callarg, fh_size) = fh_size;
+ SPARG(&callarg, buf) = buf;
+ SPARG(&callarg, flags) = flags;
+
+ error = rsys_syscall(SYS___fhstatvfs190, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+#ifdef RUMP_KERNEL_IS_LIBC
+__weak_alias(fhstatvfs1,rump___sysimpl_fhstatvfs190);
+__weak_alias(__fhstatvfs190,rump___sysimpl_fhstatvfs190);
+__weak_alias(___fhstatvfs190,rump___sysimpl_fhstatvfs190);
+__strong_alias(_sys___fhstatvfs190,rump___sysimpl_fhstatvfs190);
+#endif /* RUMP_KERNEL_IS_LIBC */
+
int rump_sys_pipe(int *);
int
rump_sys_pipe(int *fd)
@@ -7928,17 +7931,17 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 355 = uuidgen */
{
- ns(struct sys_getvfsstat_args),
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 356 = getvfsstat */
+ .sy_flags = SYCALL_NOSYS,
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 356 = getvfsstat */
{
- ns(struct sys_statvfs1_args),
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 357 = statvfs1 */
+ .sy_flags = SYCALL_NOSYS,
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 357 = statvfs1 */
{
- ns(struct sys_fstatvfs1_args),
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 358 = fstatvfs1 */
+ .sy_flags = SYCALL_NOSYS,
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 358 = fstatvfs1 */
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_sys_nomodule,
@@ -8092,9 +8095,9 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 396 = __fhopen40 */
{
- ns(struct sys___fhstatvfs140_args),
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 397 = __fhstatvfs140 */
+ .sy_flags = SYCALL_NOSYS,
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 397 = fhstatvfs1 */
{
ns(struct compat_50_sys___fhstat40_args),
.sy_call = (sy_call_t *)rumpns_sys_nomodule,
@@ -8429,21 +8432,21 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 482 = clock_getcpuclockid2 */
{
- .sy_flags = SYCALL_NOSYS,
+ ns(struct sys___getvfsstat90_args),
.sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 483 = filler */
+ }, /* 483 = __getvfsstat90 */
{
- .sy_flags = SYCALL_NOSYS,
+ ns(struct sys___statvfs190_args),
.sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 484 = filler */
+ }, /* 484 = __statvfs190 */
{
- .sy_flags = SYCALL_NOSYS,
+ ns(struct sys___fstatvfs190_args),
.sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 485 = filler */
+ }, /* 485 = __fstatvfs190 */
{
- .sy_flags = SYCALL_NOSYS,
+ ns(struct sys___fhstatvfs190_args),
.sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 486 = filler */
+ }, /* 486 = __fhstatvfs190 */
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_enosys,
@@ -8552,14 +8555,14 @@ const uint32_t rump_sysent_nomodbits[] =
0x23f80083, /* syscalls 64- 95 */
0x2437f0ea, /* syscalls 96-127 */
0x7877f406, /* syscalls 128-159 */
- 0x7f000e1e, /* syscalls 160-191 */
+ 0x7f008e1e, /* syscalls 160-191 */
0xf0044010, /* syscalls 192-223 */
0xff9167ff, /* syscalls 224-255 */
0x01d107ff, /* syscalls 256-287 */
0x0000fc88, /* syscalls 288-319 */
- 0x02000001, /* syscalls 320-351 */
- 0x00600080, /* syscalls 352-383 */
- 0x007fc338, /* syscalls 384-415 */
+ 0x0200fc01, /* syscalls 320-351 */
+ 0x006000f0, /* syscalls 352-383 */
+ 0x007fe338, /* syscalls 384-415 */
0x1c470040, /* syscalls 416-447 */
0x00000000, /* syscalls 448-479 */
0x00000000, /* syscalls 480-511 */
Index: src/sys/rump/librump/rumpkern/rumpkern_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.4 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.5
--- src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.4 Tue Jan 26 18:12:18 2016
+++ src/sys/rump/librump/rumpkern/rumpkern_syscalls.c Sun Sep 22 19:03:21 2019
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpkern_syscalls.c,v 1.4 2016/01/26 23:12:18 pooka Exp $ */
+/* $NetBSD: rumpkern_syscalls.c,v 1.5 2019/09/22 23:03:21 christos Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpkern_syscalls.c,v 1.4 2016/01/26 23:12:18 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpkern_syscalls.c,v 1.5 2019/09/22 23:03:21 christos Exp $");
#include <sys/param.h>
Index: src/sys/rump/librump/rumpnet/rumpnet_syscalls.c
diff -u src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.4 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.5
--- src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.4 Tue Jan 26 18:12:18 2016
+++ src/sys/rump/librump/rumpnet/rumpnet_syscalls.c Sun Sep 22 19:03:21 2019
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpnet_syscalls.c,v 1.4 2016/01/26 23:12:18 pooka Exp $ */
+/* $NetBSD: rumpnet_syscalls.c,v 1.5 2019/09/22 23:03:21 christos Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpnet_syscalls.c,v 1.4 2016/01/26 23:12:18 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpnet_syscalls.c,v 1.5 2019/09/22 23:03:21 christos Exp $");
#include <sys/param.h>
@@ -23,6 +23,7 @@ extern sy_call_t sys_getsockopt;
extern sy_call_t sys_sendto;
extern sy_call_t sys_shutdown;
extern sy_call_t sys_socketpair;
+extern sy_call_t sys_getsockopt2;
extern sy_call_t sys___socket30;
extern sy_call_t sys_paccept;
extern sy_call_t sys_recvmmsg;
@@ -43,6 +44,7 @@ static const struct rump_onesyscall mysy
{ 133, sys_sendto },
{ 134, sys_shutdown },
{ 135, sys_socketpair },
+ { 193, sys_getsockopt2 },
{ 394, sys___socket30 },
{ 456, sys_paccept },
{ 475, sys_recvmmsg },
Index: src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c
diff -u src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.5 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.6
--- src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.5 Tue Jan 26 18:12:18 2016
+++ src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c Sun Sep 22 19:03:21 2019
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpvfs_syscalls.c,v 1.5 2016/01/26 23:12:18 pooka Exp $ */
+/* $NetBSD: rumpvfs_syscalls.c,v 1.6 2019/09/22 23:03:21 christos Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpvfs_syscalls.c,v 1.5 2016/01/26 23:12:18 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvfs_syscalls.c,v 1.6 2019/09/22 23:03:21 christos Exp $");
#include <sys/param.h>
@@ -53,9 +53,6 @@ extern sy_call_t sys___getcwd;
extern sy_call_t sys_fchroot;
extern sy_call_t sys_lchflags;
extern sy_call_t sys_fsync_range;
-extern sy_call_t sys_getvfsstat;
-extern sy_call_t sys_statvfs1;
-extern sy_call_t sys_fstatvfs1;
extern sy_call_t sys_extattrctl;
extern sy_call_t sys_extattr_set_file;
extern sy_call_t sys_extattr_get_file;
@@ -84,7 +81,6 @@ extern sy_call_t sys_fremovexattr;
extern sy_call_t sys___getdents30;
extern sy_call_t sys___getfh30;
extern sy_call_t sys___fhopen40;
-extern sy_call_t sys___fhstatvfs140;
extern sy_call_t sys___mount50;
extern sy_call_t sys___utimes50;
extern sy_call_t sys___futimes50;
@@ -157,9 +153,6 @@ static const struct rump_onesyscall mysy
{ 297, sys_fchroot },
{ 304, sys_lchflags },
{ 354, sys_fsync_range },
- { 356, sys_getvfsstat },
- { 357, sys_statvfs1 },
- { 358, sys_fstatvfs1 },
{ 360, sys_extattrctl },
{ 361, sys_extattr_set_file },
{ 362, sys_extattr_get_file },
@@ -188,7 +181,6 @@ static const struct rump_onesyscall mysy
{ 390, sys___getdents30 },
{ 395, sys___getfh30 },
{ 396, sys___fhopen40 },
- { 397, sys___fhstatvfs140 },
{ 410, sys___mount50 },
{ 420, sys___utimes50 },
{ 423, sys___futimes50 },
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.307 src/sys/sys/syscall.h:1.308
--- src/sys/sys/syscall.h:1.307 Fri Aug 10 17:47:16 2018
+++ src/sys/sys/syscall.h Sun Sep 22 19:03:21 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.307 2018/08/10 21:47:16 pgoyette Exp $ */
+/* $NetBSD: syscall.h,v 1.308 2019/09/22 23:03:21 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp
+ * created from NetBSD: syscalls.master,v 1.296 2019/09/22 22:59:39 christos Exp
*/
#ifndef _SYS_SYSCALL_H_
@@ -957,16 +957,16 @@
/* syscall: "uuidgen" ret: "int" args: "struct uuid *" "int" */
#define SYS_uuidgen 355
-/* syscall: "getvfsstat" ret: "int" args: "struct statvfs *" "size_t" "int" */
-#define SYS_getvfsstat 356
+/* syscall: "compat_90_getvfsstat" ret: "int" args: "struct statvfs90 *" "size_t" "int" */
+#define SYS_compat_90_getvfsstat 356
-/* syscall: "statvfs1" ret: "int" args: "const char *" "struct statvfs *" "int" */
-#define SYS_statvfs1 357
+/* syscall: "compat_90_statvfs1" ret: "int" args: "const char *" "struct statvfs90 *" "int" */
+#define SYS_compat_90_statvfs1 357
-/* syscall: "fstatvfs1" ret: "int" args: "int" "struct statvfs *" "int" */
-#define SYS_fstatvfs1 358
+/* syscall: "compat_90_fstatvfs1" ret: "int" args: "int" "struct statvfs90 *" "int" */
+#define SYS_compat_90_fstatvfs1 358
-/* syscall: "compat_30_fhstatvfs1" ret: "int" args: "const struct compat_30_fhandle *" "struct statvfs *" "int" */
+/* syscall: "compat_30_fhstatvfs1" ret: "int" args: "const struct compat_30_fhandle *" "struct statvfs90 *" "int" */
#define SYS_compat_30_fhstatvfs1 359
/* syscall: "extattrctl" ret: "int" args: "const char *" "int" "const char *" "int" "const char *" */
@@ -1078,8 +1078,8 @@
/* syscall: "__fhopen40" ret: "int" args: "const void *" "size_t" "int" */
#define SYS___fhopen40 396
-/* syscall: "__fhstatvfs140" ret: "int" args: "const void *" "size_t" "struct statvfs *" "int" */
-#define SYS___fhstatvfs140 397
+/* syscall: "compat_90_fhstatvfs1" ret: "int" args: "const void *" "size_t" "struct statvfs90 *" "int" */
+#define SYS_compat_90_fhstatvfs1 397
/* syscall: "compat_50___fhstat40" ret: "int" args: "const void *" "size_t" "struct stat30 *" */
#define SYS_compat_50___fhstat40 398
@@ -1329,6 +1329,18 @@
/* syscall: "clock_getcpuclockid2" ret: "int" args: "idtype_t" "id_t" "clockid_t *" */
#define SYS_clock_getcpuclockid2 482
-#define SYS_MAXSYSCALL 483
+/* syscall: "__getvfsstat90" ret: "int" args: "struct statvfs *" "size_t" "int" */
+#define SYS___getvfsstat90 483
+
+/* syscall: "__statvfs190" ret: "int" args: "const char *" "struct statvfs *" "int" */
+#define SYS___statvfs190 484
+
+/* syscall: "__fstatvfs190" ret: "int" args: "int" "struct statvfs *" "int" */
+#define SYS___fstatvfs190 485
+
+/* syscall: "__fhstatvfs190" ret: "int" args: "const void *" "size_t" "struct statvfs *" "int" */
+#define SYS___fhstatvfs190 486
+
+#define SYS_MAXSYSCALL 487
#define SYS_NSYSENT 512
#endif /* _SYS_SYSCALL_H_ */
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.291 src/sys/sys/syscallargs.h:1.292
--- src/sys/sys/syscallargs.h:1.291 Fri Aug 10 17:47:16 2018
+++ src/sys/sys/syscallargs.h Sun Sep 22 19:03:21 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.291 2018/08/10 21:47:16 pgoyette Exp $ */
+/* $NetBSD: syscallargs.h,v 1.292 2019/09/22 23:03:21 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp
+ * created from NetBSD: syscalls.master,v 1.296 2019/09/22 22:59:39 christos Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -2191,31 +2191,37 @@ struct sys_uuidgen_args {
check_syscall_args(sys_uuidgen)
#endif /* !RUMP_CLIENT */
-struct sys_getvfsstat_args {
- syscallarg(struct statvfs *) buf;
+#ifndef RUMP_CLIENT
+struct compat_90_sys_getvfsstat_args {
+ syscallarg(struct statvfs90 *) buf;
syscallarg(size_t) bufsize;
syscallarg(int) flags;
};
-check_syscall_args(sys_getvfsstat)
+check_syscall_args(compat_90_sys_getvfsstat)
+#endif /* !RUMP_CLIENT */
-struct sys_statvfs1_args {
+#ifndef RUMP_CLIENT
+struct compat_90_sys_statvfs1_args {
syscallarg(const char *) path;
- syscallarg(struct statvfs *) buf;
+ syscallarg(struct statvfs90 *) buf;
syscallarg(int) flags;
};
-check_syscall_args(sys_statvfs1)
+check_syscall_args(compat_90_sys_statvfs1)
+#endif /* !RUMP_CLIENT */
-struct sys_fstatvfs1_args {
+#ifndef RUMP_CLIENT
+struct compat_90_sys_fstatvfs1_args {
syscallarg(int) fd;
- syscallarg(struct statvfs *) buf;
+ syscallarg(struct statvfs90 *) buf;
syscallarg(int) flags;
};
-check_syscall_args(sys_fstatvfs1)
+check_syscall_args(compat_90_sys_fstatvfs1)
+#endif /* !RUMP_CLIENT */
#ifndef RUMP_CLIENT
struct compat_30_sys_fhstatvfs1_args {
syscallarg(const struct compat_30_fhandle *) fhp;
- syscallarg(struct statvfs *) buf;
+ syscallarg(struct statvfs90 *) buf;
syscallarg(int) flags;
};
check_syscall_args(compat_30_sys_fhstatvfs1)
@@ -2498,13 +2504,15 @@ struct sys___fhopen40_args {
};
check_syscall_args(sys___fhopen40)
-struct sys___fhstatvfs140_args {
+#ifndef RUMP_CLIENT
+struct compat_90_sys_fhstatvfs1_args {
syscallarg(const void *) fhp;
syscallarg(size_t) fh_size;
- syscallarg(struct statvfs *) buf;
+ syscallarg(struct statvfs90 *) buf;
syscallarg(int) flags;
};
-check_syscall_args(sys___fhstatvfs140)
+check_syscall_args(compat_90_sys_fhstatvfs1)
+#endif /* !RUMP_CLIENT */
struct compat_50_sys___fhstat40_args {
syscallarg(const void *) fhp;
@@ -3138,6 +3146,35 @@ struct sys_clock_getcpuclockid2_args {
check_syscall_args(sys_clock_getcpuclockid2)
#endif /* !RUMP_CLIENT */
+struct sys___getvfsstat90_args {
+ syscallarg(struct statvfs *) buf;
+ syscallarg(size_t) bufsize;
+ syscallarg(int) flags;
+};
+check_syscall_args(sys___getvfsstat90)
+
+struct sys___statvfs190_args {
+ syscallarg(const char *) path;
+ syscallarg(struct statvfs *) buf;
+ syscallarg(int) flags;
+};
+check_syscall_args(sys___statvfs190)
+
+struct sys___fstatvfs190_args {
+ syscallarg(int) fd;
+ syscallarg(struct statvfs *) buf;
+ syscallarg(int) flags;
+};
+check_syscall_args(sys___fstatvfs190)
+
+struct sys___fhstatvfs190_args {
+ syscallarg(const void *) fhp;
+ syscallarg(size_t) fh_size;
+ syscallarg(struct statvfs *) buf;
+ syscallarg(int) flags;
+};
+check_syscall_args(sys___fhstatvfs190)
+
/*
* System call prototypes.
*/
@@ -3765,11 +3802,11 @@ int sys_fsync_range(struct lwp *, const
int sys_uuidgen(struct lwp *, const struct sys_uuidgen_args *, register_t *);
-int sys_getvfsstat(struct lwp *, const struct sys_getvfsstat_args *, register_t *);
+int compat_90_sys_getvfsstat(struct lwp *, const struct compat_90_sys_getvfsstat_args *, register_t *);
-int sys_statvfs1(struct lwp *, const struct sys_statvfs1_args *, register_t *);
+int compat_90_sys_statvfs1(struct lwp *, const struct compat_90_sys_statvfs1_args *, register_t *);
-int sys_fstatvfs1(struct lwp *, const struct sys_fstatvfs1_args *, register_t *);
+int compat_90_sys_fstatvfs1(struct lwp *, const struct compat_90_sys_fstatvfs1_args *, register_t *);
int compat_30_sys_fhstatvfs1(struct lwp *, const struct compat_30_sys_fhstatvfs1_args *, register_t *);
@@ -3845,7 +3882,7 @@ int sys___getfh30(struct lwp *, const st
int sys___fhopen40(struct lwp *, const struct sys___fhopen40_args *, register_t *);
-int sys___fhstatvfs140(struct lwp *, const struct sys___fhstatvfs140_args *, register_t *);
+int compat_90_sys_fhstatvfs1(struct lwp *, const struct compat_90_sys_fhstatvfs1_args *, register_t *);
int compat_50_sys___fhstat40(struct lwp *, const struct compat_50_sys___fhstat40_args *, register_t *);
@@ -4012,5 +4049,13 @@ int sys_wait6(struct lwp *, const struct
int sys_clock_getcpuclockid2(struct lwp *, const struct sys_clock_getcpuclockid2_args *, register_t *);
+int sys___getvfsstat90(struct lwp *, const struct sys___getvfsstat90_args *, register_t *);
+
+int sys___statvfs190(struct lwp *, const struct sys___statvfs190_args *, register_t *);
+
+int sys___fstatvfs190(struct lwp *, const struct sys___fstatvfs190_args *, register_t *);
+
+int sys___fhstatvfs190(struct lwp *, const struct sys___fhstatvfs190_args *, register_t *);
+
#endif /* !RUMP_CLIENT */
#endif /* _SYS_SYSCALLARGS_H_ */
