Module Name: src
Committed By: maxv
Date: Thu Mar 28 19:00:41 UTC 2019
Modified Files:
src/share/man/man4: nvmm.4
src/sys/arch/amd64/conf: GENERIC
src/sys/dev/nvmm: files.nvmm nvmm.c
Log Message:
Move NVMM in the "any" class, so that it can be enabled in GENERIC. Add
missing files in files.nvmm, and add NVMM (commented out) in the amd64
GENERIC. Remove the "caveats" section in the man page.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/nvmm.4
cvs rdiff -u -r1.520 -r1.521 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/nvmm/files.nvmm
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/nvmm/nvmm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/nvmm.4
diff -u src/share/man/man4/nvmm.4:1.3 src/share/man/man4/nvmm.4:1.4
--- src/share/man/man4/nvmm.4:1.3 Wed Feb 13 16:06:28 2019
+++ src/share/man/man4/nvmm.4 Thu Mar 28 19:00:40 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: nvmm.4,v 1.3 2019/02/13 16:06:28 maxv Exp $
+.\" $NetBSD: nvmm.4,v 1.4 2019/03/28 19:00:40 maxv Exp $
.\"
.\" Copyright (c) 2018 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd February 13, 2019
+.Dd March 28, 2019
.Dt NVMM 4
.Os
.Sh NAME
@@ -60,9 +60,3 @@ The
.Nm
driver was written by
.An Maxime Villard .
-.Sh CAVEATS
-Currently,
-.Nm
-cannot be enabled in a kernel configuration, and must rather be
-.Xr modload 8 Ns ed
-dynamically from the filesystem.
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.520 src/sys/arch/amd64/conf/GENERIC:1.521
--- src/sys/arch/amd64/conf/GENERIC:1.520 Fri Mar 1 12:25:09 2019
+++ src/sys/arch/amd64/conf/GENERIC Thu Mar 28 19:00:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.520 2019/03/01 12:25:09 nonaka Exp $
+# $NetBSD: GENERIC,v 1.521 2019/03/28 19:00:40 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.520 $"
+#ident "GENERIC-$Revision: 1.521 $"
maxusers 64 # estimated number of users
@@ -1169,6 +1169,7 @@ pseudo-device ksyms # /dev/ksyms
pseudo-device lockstat # lock profiling
pseudo-device bcsp # BlueCore Serial Protocol
pseudo-device btuart # Bluetooth HCI UART (H4)
+#pseudo-device nvmm # NetBSD Virtual Machine Monitor
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda # coda minicache <-> venus comm.
Index: src/sys/dev/nvmm/files.nvmm
diff -u src/sys/dev/nvmm/files.nvmm:1.1 src/sys/dev/nvmm/files.nvmm:1.2
--- src/sys/dev/nvmm/files.nvmm:1.1 Wed Nov 7 07:43:08 2018
+++ src/sys/dev/nvmm/files.nvmm Thu Mar 28 19:00:40 2019
@@ -1,11 +1,14 @@
-# $NetBSD: files.nvmm,v 1.1 2018/11/07 07:43:08 maxv Exp $
+# $NetBSD: files.nvmm,v 1.2 2019/03/28 19:00:40 maxv Exp $
defpseudo nvmm
file dev/nvmm/nvmm.c nvmm
ifdef amd64
+file dev/nvmm/x86/nvmm_x86.c nvmm
file dev/nvmm/x86/nvmm_x86_svm.c nvmm
file dev/nvmm/x86/nvmm_x86_svmfunc.S nvmm
+file dev/nvmm/x86/nvmm_x86_vmx.c nvmm
+file dev/nvmm/x86/nvmm_x86_vmxfunc.S nvmm
endif
Index: src/sys/dev/nvmm/nvmm.c
diff -u src/sys/dev/nvmm/nvmm.c:1.11 src/sys/dev/nvmm/nvmm.c:1.12
--- src/sys/dev/nvmm/nvmm.c:1.11 Thu Mar 21 20:21:40 2019
+++ src/sys/dev/nvmm/nvmm.c Thu Mar 28 19:00:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm.c,v 1.11 2019/03/21 20:21:40 maxv Exp $ */
+/* $NetBSD: nvmm.c,v 1.12 2019/03/28 19:00:40 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.11 2019/03/21 20:21:40 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.12 2019/03/28 19:00:40 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -933,7 +933,7 @@ nvmmattach(int nunits)
/* nothing */
}
-MODULE(MODULE_CLASS_DRIVER, nvmm, NULL);
+MODULE(MODULE_CLASS_ANY, nvmm, NULL);
static int
nvmm_modcmd(modcmd_t cmd, void *arg)
