Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src/sys/compat/netbsd32 Install the syscalls into the ...
details: https://anonhg.NetBSD.org/src/rev/57a9daf8bea3
branches: pgoyette-compat
changeset: 830647:57a9daf8bea3
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Tue Sep 11 04:53:42 2018 +0000
description:
Install the syscalls into the netbsd32 table, not the default/native table.
diffstat:
sys/compat/netbsd32/netbsd32_compat_09.c | 22 +++++++++++++---------
sys/compat/netbsd32/netbsd32_compat_12.c | 14 ++++++++------
sys/compat/netbsd32/netbsd32_compat_13.c | 10 ++++++----
sys/compat/netbsd32/netbsd32_compat_20.c | 12 +++++++-----
sys/compat/netbsd32/netbsd32_compat_30.c | 13 ++++++++-----
sys/compat/netbsd32/netbsd32_compat_50.c | 14 ++++++++------
sys/compat/netbsd32/netbsd32_compat_60.c | 10 ++++++----
sys/compat/netbsd32/netbsd32_mod.c | 10 ++++++++--
sys/compat/netbsd32/netbsd32_module.c | 9 ++++++---
9 files changed, 70 insertions(+), 44 deletions(-)
diffs (truncated from 365 to 300 lines):
diff -r a2428d077e2e -r 57a9daf8bea3 sys/compat/netbsd32/netbsd32_compat_09.c
--- a/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 04:20:50 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 04:53:42 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.2 2018/09/11 02:53:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.3 2018/09/11 04:53:42 pgoyette Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.2 2018/09/11 02:53:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.3 2018/09/11 04:53:42 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,6 +40,8 @@
#include <uvm/uvm_extern.h>
#include <sys/sysctl.h>
+#include <compat/sys/siginfo.h>
+
#include <compat/netbsd32/netbsd32.h>
#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
@@ -87,13 +89,13 @@
NETBSD32TOP_UAP(name, struct outsname);
return (compat_09_sys_uname(l, &ua, retval));
}
-NETBSD32_SYS_compat_30_netbsd32_fhstat
+
static struct syscall_package compat_netbsd32_09_syscalls[] = {
- { NETBSD32_SYS_compat_30_netbsd32_ogetdomainname, 0,
+ { NETBSD32_SYS_compat_09_netbsd32_ogetdomainname, 0,
(sy_call_t *)compat_09_netbsd32_ogetdomainname },
- { NETBSD32_SYS_compat_30_netbsd32_osetdomainname, 0,
+ { NETBSD32_SYS_compat_09_netbsd32_osetdomainname, 0,
(sy_call_t *)compat_09_netbsd32_osetdomainname },
- { NETBSD32_SYS_compat_30_netbsd32_ouname, 0,
+ { NETBSD32_SYS_compat_09_netbsd32_uname, 0,
(sy_call_t *)compat_09_netbsd32_uname },
{ 0, 0, NULL }
};
@@ -101,15 +103,17 @@
MODULE(MODULE_CLASS_EXEC, compat_netbsd32_09, "compat_netbsd32,compat_09");
static int
-compat_netbsd32_09_modcmd(modcmt_t cmd, void *(arg)
+compat_netbsd32_09_modcmd(modcmd_t cmd, void *arg)
{
switch (cmd) {
case MODULE_CMD_INIT:
- return syscall_establish(NULL, compat_netbsd32_09_syscalls);
+ return syscall_establish(&emul_netbsd32,
+ compat_netbsd32_09_syscalls);
case MODULE_CMD_FINI:
- return syscall_disestablish(NULL, compat_netbsd32_09_syscalls);
+ return syscall_disestablish(&emul_netbsd32,
+ compat_netbsd32_09_syscalls);
default:
return ENOTTY;
diff -r a2428d077e2e -r 57a9daf8bea3 sys/compat/netbsd32/netbsd32_compat_12.c
--- a/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 04:20:50 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 04:53:42 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.4 2018/09/11 02:53:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.5 2018/09/11 04:53:42 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.4 2018/09/11 02:53:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.5 2018/09/11 04:53:42 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -216,8 +216,8 @@
(sy_call_t *)compat_12_netbsd32_reboot },
{ NETBSD32_SYS_compat_12_netbsd32_msync, 0,
(sy_call_t *)compat_12_netbsd32_msync },
- { NETBSD32_SYS_compat_12_netbsd32_swapon, 0,
- (sy_call_t *)compat_12_netbsd32_swapon },
+ { NETBSD32_SYS_compat_12_netbsd32_oswapon, 0,
+ (sy_call_t *)compat_12_netbsd32_oswapon },
{ NETBSD32_SYS_compat_12_netbsd32_stat12, 0,
(sy_call_t *)compat_12_netbsd32_stat12 },
{ NETBSD32_SYS_compat_12_netbsd32_fstat12, 0,
@@ -237,10 +237,12 @@
switch (cmd) {
case MODULE_CMD_INIT:
- return syscall_establish(NULL, compat_netbsd32_12_syscalls);
+ return syscall_establish(&emul_netbsd32,
+ compat_netbsd32_12_syscalls);
case MODULE_CMD_FINI:
- return syscall_disestablish(NULL, compat_netbsd32_12_syscalls);
+ return syscall_disestablish(&emul_netbsd32,
+ compat_netbsd32_12_syscalls);
default:
return ENOTTY;
diff -r a2428d077e2e -r 57a9daf8bea3 sys/compat/netbsd32/netbsd32_compat_13.c
--- a/sys/compat/netbsd32/netbsd32_compat_13.c Tue Sep 11 04:20:50 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_13.c Tue Sep 11 04:53:42 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.3 2018/09/11 02:53:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.4 2018/09/11 04:53:42 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.3 2018/09/11 02:53:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.4 2018/09/11 04:53:42 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,10 +112,12 @@
switch (cmd) {
case MODULE_CMD_INIT:
- return syscall_establish(NULL, compat_netbsd32_13_syscalls);
+ return syscall_establish(&emul_netbsd32,
+ compat_netbsd32_13_syscalls);
case MODULE_CMD_FINI:
- return syscall_disestablish(NULL, compat_netbsd32_13_syscalls);
+ return syscall_disestablish(&emul_netbsd32,
+ compat_netbsd32_13_syscalls);
default:
return ENOTTY;
diff -r a2428d077e2e -r 57a9daf8bea3 sys/compat/netbsd32/netbsd32_compat_20.c
--- a/sys/compat/netbsd32/netbsd32_compat_20.c Tue Sep 11 04:20:50 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_20.c Tue Sep 11 04:53:42 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.5 2018/09/11 02:53:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.6 2018/09/11 04:53:42 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.5 2018/09/11 02:53:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.6 2018/09/11 04:53:42 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -235,15 +235,17 @@
MODULE(MODULE_CLASS_EXEC, compat_netbsd32_20, "compat_netbsd32,compat_20");
static int
-compat_netbsd32_20_modcmt(modcmd_t cmd, void *arg)
+compat_netbsd32_20_modcmd(modcmd_t cmd, void *arg)
{
switch (cmd) {
case MODULE_CMD_INIT:
- return syscall_establish(NULL, compat_netbsd32_20_syscalls);
+ return syscall_establish(&emul_netbsd32,
+ compat_netbsd32_20_syscalls);
case MODULE_CMD_FINI:
- return syscall_disestablish(NULL, compat_netbsd32_20_syscalls);
+ return syscall_disestablish(&emul_netbsd32,
+ compat_netbsd32_20_syscalls);
default:
return ENOTTY;
diff -r a2428d077e2e -r 57a9daf8bea3 sys/compat/netbsd32/netbsd32_compat_30.c
--- a/sys/compat/netbsd32/netbsd32_compat_30.c Tue Sep 11 04:20:50 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_30.c Tue Sep 11 04:53:42 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.4 2018/09/11 02:53:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.5 2018/09/11 04:53:42 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,10 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.4 2018/09/11 02:53:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.5 2018/09/11 04:53:42 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/module.h>
#include <sys/mount.h>
#include <sys/mount.h>
#include <sys/socket.h>
@@ -317,7 +318,7 @@
{ NETBSD32_SYS_compat_30_netbsd32___fhstat30, 0,
(sy_call_t *)compat_30_netbsd32___fhstat30 },
{ NETBSD32_SYS_compat_30_netbsd32_fhopen, 0,
- (sy_call_t *)compat_30_netbsd32___fhopen },
+ (sy_call_t *)compat_30_netbsd32_fhopen },
{ 0, 0, NULL }
};
@@ -329,10 +330,12 @@
switch (cmd) {
case MODULE_CMD_INIT:
- return syscall_establish(NULL, compat_netbsd32_30_syscalls);
+ return syscall_establish(&emul_netbsd32,
+ compat_netbsd32_30_syscalls);
case MODULE_CMD_FINI:
- return syscall_disestablish(NULL, compat_netbsd32_30_syscalls);
+ return syscall_disestablish(&emul_netbsd32,
+ compat_netbsd32_30_syscalls);
default:
return ENOTTY;
diff -r a2428d077e2e -r 57a9daf8bea3 sys/compat/netbsd32/netbsd32_compat_50.c
--- a/sys/compat/netbsd32/netbsd32_compat_50.c Tue Sep 11 04:20:50 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_50.c Tue Sep 11 04:53:42 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.3 2018/09/11 02:53:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.4 2018/09/11 04:53:42 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.3 2018/09/11 02:53:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.4 2018/09/11 04:53:42 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -994,11 +994,13 @@
{
switch (cmd) {
- MODULE_CMD_INIT:
- return syscall_establish(NULL, compat_netbsd32_50_syscalls);
+ case MODULE_CMD_INIT:
+ return syscall_establish(&emul_netbsd32,
+ compat_netbsd32_50_syscalls);
- MODULE_CMD_FINI:
- return syscall_disestablish(NULL, compat_netbsd32_50_syscalls);
+ case MODULE_CMD_FINI:
+ return syscall_disestablish(&emul_netbsd32,
+ compat_netbsd32_50_syscalls);
default:
return ENOTTY;
diff -r a2428d077e2e -r 57a9daf8bea3 sys/compat/netbsd32/netbsd32_compat_60.c
--- a/sys/compat/netbsd32/netbsd32_compat_60.c Tue Sep 11 04:20:50 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_60.c Tue Sep 11 04:53:42 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.3 2018/09/11 02:53:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.4 2018/09/11 04:53:42 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.3 2018/09/11 02:53:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.4 2018/09/11 04:53:42 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,10 +103,12 @@
switch (cmd) {
case MODULE_CMD_INIT:
- return syscall_establish(NULL, compat_netbsd32_60_syscalls);
+ return syscall_establish(&emul_netbsd32,
+ compat_netbsd32_60_syscalls);
case MODULE_CMD_FINI:
- return syscall_disestablish(NULL, compat_netbsd32_60_syscalls);
+ return syscall_disestablish(&emul_netbsd32,
+ compat_netbsd32_60_syscalls);
default:
return ENOTTY;
diff -r a2428d077e2e -r 57a9daf8bea3 sys/compat/netbsd32/netbsd32_mod.c
--- a/sys/compat/netbsd32/netbsd32_mod.c Tue Sep 11 04:20:50 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_mod.c Tue Sep 11 04:53:42 2018 +0000
Home |
Main Index |
Thread Index |
Old Index