Module Name: src
Committed By: maxv
Date: Sun Jan 6 16:13:51 UTC 2019
Modified Files:
src/sys/arch/x86/x86: identcpu.c
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Handle the NVMM signature.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/x86/x86/identcpu.c
cvs rdiff -u -r1.90 -r1.91 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.84 src/sys/arch/x86/x86/identcpu.c:1.85
--- src/sys/arch/x86/x86/identcpu.c:1.84 Sun Dec 16 10:42:32 2018
+++ src/sys/arch/x86/x86/identcpu.c Sun Jan 6 16:13:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: identcpu.c,v 1.84 2018/12/16 10:42:32 maxv Exp $ */
+/* $NetBSD: identcpu.c,v 1.85 2019/01/06 16:13:51 maxv Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.84 2018/12/16 10:42:32 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.85 2019/01/06 16:13:51 maxv Exp $");
#include "opt_xen.h"
@@ -1118,6 +1118,7 @@ identify_hypervisor(void)
vm_guest = VM_GUEST_KVM;
/* FreeBSD bhyve: "bhyve bhyve " */
/* OpenBSD vmm: "OpenBSDVMM58" */
+ /* NetBSD nvmm: "___ NVMM ___" */
}
return;
}
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.90 src/usr.sbin/cpuctl/arch/i386.c:1.91
--- src/usr.sbin/cpuctl/arch/i386.c:1.90 Mon Nov 26 04:45:13 2018
+++ src/usr.sbin/cpuctl/arch/i386.c Sun Jan 6 16:13:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.90 2018/11/26 04:45:13 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.91 2019/01/06 16:13:51 maxv Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.90 2018/11/26 04:45:13 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.91 2019/01/06 16:13:51 maxv Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -1718,6 +1718,7 @@ cpu_probe_hv_features(struct cpu_info *c
* Microsoft "Microsoft Hv"
* VMware "VMwareVMware"
* Xen "XenVMMXenVMM"
+ * NetBSD "___ NVMM ___"
*/
if (strncmp(hv_sig, "KVMKVMKVM", 9) == 0)
hv_name = "KVM";
@@ -1727,6 +1728,8 @@ cpu_probe_hv_features(struct cpu_info *c
hv_name = "VMware";
else if (strncmp(hv_sig, "XenVMMXenVMM", 12) == 0)
hv_name = "Xen";
+ else if (strncmp(hv_sig, "___ NVMM ___", 12) == 0)
+ hv_name = "NVMM";
else
hv_name = "unknown";
