[go: up one dir, main page]

aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Bowling <kbowling@FreeBSD.org>2024-08-28 09:31:35 +0000
committerKevin Bowling <kbowling@FreeBSD.org>2024-08-28 20:39:07 +0000
commitf622dc5daecc5c05504cfc605b6f2d66a3bd90e8 (patch)
treef78dcd5c7ecf553cf8b20709cff4e977e334724d
parentcb91dc50950ffdfd49337e844e231b69b8b5c634 (diff)
downloadsrc-main.tar.gz
src-main.zip
x86: Detect NVMM hypervisorHEADmain
MFC after: 1 week
-rw-r--r--sys/kern/subr_param.c1
-rw-r--r--sys/sys/systm.h2
-rw-r--r--sys/x86/x86/identcpu.c1
3 files changed, 3 insertions, 1 deletions
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