git: f622dc5daecc - main - x86: Detect NVMM hypervisor

The branch main has been updated by kbowling:

URL: https://cgit.FreeBSD.org/src/commit/?id=f622dc5daecc5c05504cfc605b6f2d66a3bd90e8

commit f622dc5daecc5c05504cfc605b6f2d66a3bd90e8
Author:     Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2024-08-28 09:31:35 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2024-08-28 20:39:07 +0000

    x86: Detect NVMM hypervisor
    
    MFC after:      1 week
---
 sys/kern/subr_param.c  | 1 +
 sys/sys/systm.h        | 2 +-
 sys/x86/x86/identcpu.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index ea5e8d02be2b..7d58208a461f 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -157,6 +157,7 @@ static const char *const vm_guest_sysctl_names[] = {
 	[VM_GUEST_BHYVE] = "bhyve",
 	[VM_GUEST_VBOX] = "vbox",
 	[VM_GUEST_PARALLELS] = "parallels",
+	[VM_GUEST_NVMM] = "nvmm",
 };
 _Static_assert(nitems(vm_guest_sysctl_names) == VM_GUEST_LAST,
     "new vm guest type not added to vm_guest_sysctl_names");
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 6c2b466c4cfe..61874a05e0b9 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -79,7 +79,7 @@ extern u_long maxphys;		/* max raw I/O transfer size */
  */
 enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV,
 		VM_GUEST_VMWARE, VM_GUEST_KVM, VM_GUEST_BHYVE, VM_GUEST_VBOX,
-		VM_GUEST_PARALLELS, VM_GUEST_LAST };
+		VM_GUEST_PARALLELS, VM_GUEST_NVMM, VM_GUEST_LAST };
 
 #endif /* KERNEL */
 
diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c
index 4da250c535a0..f24fdc1647e6 100644
--- a/sys/x86/x86/identcpu.c
+++ b/sys/x86/x86/identcpu.c
@@ -1370,6 +1370,7 @@ static struct {
 	{ "KVMKVMKVM",		VM_GUEST_KVM },		/* KVM */
 	{ "bhyve bhyve ",	VM_GUEST_BHYVE },	/* bhyve */
 	{ "VBoxVBoxVBox",	VM_GUEST_VBOX },	/* VirtualBox */
+	{ "___ NVMM ___",	VM_GUEST_NVMM },	/* NVMM */
 };
 
 static void