[src/trunk]: src Handle the NVMM signature.

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf42e4a93b93
branches:  trunk
changeset: 447284:cf42e4a93b93
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun Jan 06 16:13:51 2019 +0000

description:
Handle the NVMM signature.

diffstat:

 sys/arch/x86/x86/identcpu.c |  5 +++--
 usr.sbin/cpuctl/arch/i386.c |  7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r 68cee890c922 -r cf42e4a93b93 sys/arch/x86/x86/identcpu.c
--- a/sys/arch/x86/x86/identcpu.c       Sun Jan 06 16:10:51 2019 +0000
+++ b/sys/arch/x86/x86/identcpu.c       Sun Jan 06 16:13:51 2019 +0000
@@ -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 @@
                                vm_guest = VM_GUEST_KVM;
                        /* FreeBSD bhyve: "bhyve bhyve " */
                        /* OpenBSD vmm:   "OpenBSDVMM58" */
+                       /* NetBSD nvmm:   "___ NVMM ___" */
                }
                return;
        }
diff -r 68cee890c922 -r cf42e4a93b93 usr.sbin/cpuctl/arch/i386.c
--- a/usr.sbin/cpuctl/arch/i386.c       Sun Jan 06 16:10:51 2019 +0000
+++ b/usr.sbin/cpuctl/arch/i386.c       Sun Jan 06 16:13:51 2019 +0000
@@ -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 @@
                 * Microsoft    "Microsoft Hv"
                 * VMware       "VMwareVMware"
                 * Xen          "XenVMMXenVMM"
+                * NetBSD       "___ NVMM ___"
                 */
                if (strncmp(hv_sig, "KVMKVMKVM", 9) == 0)
                        hv_name = "KVM";
@@ -1727,6 +1728,8 @@
                        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";