Module Name: src
Committed By: pgoyette
Date: Sun Mar 15 14:15:12 UTC 2020
Modified Files:
src/sys/compat/netbsd32: netbsd32_mod.c netbsd32_sysctl.c
Removed Files:
src/sys/compat/netbsd32: netbsd32_sysctl.h
Log Message:
Use SYSCTL_SETUP mechanism to establish our sysctl tree, rather than
using explicit calls to netbsd32_sysctl_{init,fini}()
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/netbsd32/netbsd32_mod.c
cvs rdiff -u -r1.41 -r1.42 src/sys/compat/netbsd32/netbsd32_sysctl.c
cvs rdiff -u -r1.1 -r0 src/sys/compat/netbsd32/netbsd32_sysctl.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_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.20 src/sys/compat/netbsd32/netbsd32_mod.c:1.21
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.20 Mon Mar 9 21:49:26 2020
+++ src/sys/compat/netbsd32/netbsd32_mod.c Sun Mar 15 14:15:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.20 2020/03/09 21:49:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.21 2020/03/15 14:15:12 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.20 2020/03/09 21:49:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.21 2020/03/15 14:15:12 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -76,7 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
#include <sys/module_hook.h>
#include <sys/compat_stub.h>
-#include <compat/netbsd32/netbsd32_sysctl.h>
#include <compat/netbsd32/netbsd32_kern_proc.h>
#include <compat/netbsd32/netbsd32_exec.h>
@@ -167,7 +166,6 @@ compat_netbsd32_modcmd(modcmd_t cmd, voi
error = exec_add(netbsd32_execsw,
__arraycount(netbsd32_execsw));
if (error == 0) {
- netbsd32_sysctl_init();
netbsd32_machdep_md_init();
netbsd32_kern_proc_32_init();
#if defined(__amd64__)
@@ -182,14 +180,12 @@ compat_netbsd32_modcmd(modcmd_t cmd, voi
MODULE_HOOK_UNSET(amd64_oosyscall_hook);
#endif /* defined(__amd64__) */
netbsd32_machdep_md_fini();
- netbsd32_sysctl_fini();
netbsd32_kern_proc_32_fini();
error = exec_remove(netbsd32_execsw,
__arraycount(netbsd32_execsw));
if (error) {
netbsd32_kern_proc_32_init();
- netbsd32_sysctl_init();
netbsd32_machdep_md_init();
#if defined(__amd64__)
MODULE_HOOK_SET(amd64_oosyscall_hook,
Index: src/sys/compat/netbsd32/netbsd32_sysctl.c
diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.41 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.42
--- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.41 Thu Jan 2 15:42:26 2020
+++ src/sys/compat/netbsd32/netbsd32_sysctl.c Sun Mar 15 14:15:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sysctl.c,v 1.41 2020/01/02 15:42:26 thorpej Exp $ */
+/* $NetBSD: netbsd32_sysctl.c,v 1.42 2020/03/15 14:15:12 pgoyette Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.41 2020/01/02 15:42:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.42 2020/03/15 14:15:12 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys
#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
-#include <compat/netbsd32/netbsd32_sysctl.h>
#if defined(DDB)
#include <ddb/ddbvar.h>
@@ -70,8 +69,6 @@ struct sysctlnode netbsd32_sysctl_root =
.sysctl_size = sizeof(struct sysctlnode),
};
-static struct sysctllog *netbsd32_clog;
-
/*
* sysctl helper routine for netbsd32's kern.boottime node
*/
@@ -120,78 +117,70 @@ sysctl_hw_machine_arch32(SYSCTLFN_ARGS)
return sysctl_lookup(SYSCTLFN_CALL(&node));
}
-void
-netbsd32_sysctl_init(void)
+SYSCTL_SETUP(netbsd32_sysctl_emul_setup, "netbsd32 shadow tree")
{
const struct sysctlnode *_root = &netbsd32_sysctl_root;
extern const char machine32[];
- sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ printf("%s: called\n", __func__); /* XXX PRG */
+ sysctl_createv(clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_NODE, "kern", NULL,
NULL, 0, NULL, 0,
CTL_KERN, CTL_EOL);
- sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ sysctl_createv(clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRUCT, "boottime", NULL,
netbsd32_sysctl_kern_boottime, 0, NULL,
sizeof(struct netbsd32_timeval),
CTL_KERN, KERN_BOOTTIME, CTL_EOL);
- sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ sysctl_createv(clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_NODE, "vm", NULL,
NULL, 0, NULL, 0,
CTL_VM, CTL_EOL);
- sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ sysctl_createv(clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRUCT, "loadavg", NULL,
netbsd32_sysctl_vm_loadavg, 0, NULL,
sizeof(struct netbsd32_loadavg),
CTL_VM, VM_LOADAVG, CTL_EOL);
- sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ sysctl_createv(clog, 0, &_root, NULL,
CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
CTLTYPE_INT, "maxaddress",
SYSCTL_DESCR("Maximum user address"),
NULL, VM_MAXUSER_ADDRESS32, NULL, 0,
CTL_VM, VM_MAXADDRESS, CTL_EOL);
- sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ sysctl_createv(clog, 0, &_root, NULL,
CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
CTLTYPE_INT, "minaddress",
SYSCTL_DESCR("Minimum user address"),
NULL, VM_MIN_ADDRESS, NULL, 0,
CTL_VM, VM_MINADDRESS, CTL_EOL);
- sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ sysctl_createv(clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_NODE, "hw", NULL,
NULL, 0, NULL, 0,
CTL_HW, CTL_EOL);
- sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ sysctl_createv(clog, 0, &_root, NULL,
CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
CTLTYPE_INT, "alignbytes", NULL,
NULL, ALIGNBYTES32, NULL, 0,
CTL_HW, HW_ALIGNBYTES, CTL_EOL);
- sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ sysctl_createv(clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRING, "machine", NULL,
NULL, 0, __UNCONST(&machine32), 0,
CTL_HW, HW_MACHINE, CTL_EOL);
- sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ sysctl_createv(clog, 0, &_root, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READONLY,
CTLTYPE_STRING, "machine_arch", NULL,
sysctl_hw_machine_arch32, 0, NULL, 0,
CTL_HW, HW_MACHINE_ARCH, CTL_EOL);
}
-void
-netbsd32_sysctl_fini(void)
-{
-
- sysctl_teardown(&netbsd32_clog);
- sysctl_free(&netbsd32_sysctl_root);
-}
-
int
netbsd32___sysctl(struct lwp *l, const struct netbsd32___sysctl_args *uap, register_t *retval)
{
