From 6566ac3ccf6c682057888a557f264cec4a8ba10b Mon Sep 17 00:00:00 2001 From: Dr-Noob Date: Mon, 15 Jan 2024 08:43:28 +0000 Subject: [PATCH] [v1.04] Add Apple VZ hypervisor (#218) --- src/common/cpu.h | 1 + src/ppc/ppc.c | 1 + src/x86/cpuid.c | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/common/cpu.h b/src/common/cpu.h index 7677d17..fcd9c02 100644 --- a/src/common/cpu.h +++ b/src/common/cpu.h @@ -38,6 +38,7 @@ enum { HV_VENDOR_PARALLELS, HV_VENDOR_PHYP, HV_VENDOR_BHYVE, + HV_VENDOR_APPLEVZ, HV_VENDOR_INVALID }; diff --git a/src/ppc/ppc.c b/src/ppc/ppc.c index 25c968f..9057e2e 100644 --- a/src/ppc/ppc.c +++ b/src/ppc/ppc.c @@ -20,6 +20,7 @@ static char *hv_vendors_name[] = { [HV_VENDOR_PARALLELS] = "Parallels", [HV_VENDOR_PHYP] = "pHyp", [HV_VENDOR_BHYVE] = "bhyve", + [HV_VENDOR_APPLEVZ] = "Apple VZ", [HV_VENDOR_INVALID] = STRING_UNKNOWN }; diff --git a/src/x86/cpuid.c b/src/x86/cpuid.c index 2f93a59..36813b5 100644 --- a/src/x86/cpuid.c +++ b/src/x86/cpuid.c @@ -30,8 +30,9 @@ static const char *hv_vendors_string[] = { [HV_VENDOR_VMWARE] = "VMwareVMware", [HV_VENDOR_XEN] = "XenVMMXenVMM", [HV_VENDOR_PARALLELS] = "lrpepyh vr", + [HV_VENDOR_PHYP] = NULL, [HV_VENDOR_BHYVE] = "bhyve bhyve ", - [HV_VENDOR_PHYP] = NULL + [HV_VENDOR_APPLEVZ] = "Apple VZ" }; static char *hv_vendors_name[] = { @@ -43,6 +44,7 @@ static char *hv_vendors_name[] = { [HV_VENDOR_PARALLELS] = "Parallels", [HV_VENDOR_PHYP] = "pHyp", [HV_VENDOR_BHYVE] = "bhyve", + [HV_VENDOR_APPLEVZ] = "Apple VZ", [HV_VENDOR_INVALID] = STRING_UNKNOWN }; @@ -284,7 +286,7 @@ struct hypervisor* get_hp_info(bool hv_present) { if(!found) { hv->hv_vendor = HV_VENDOR_INVALID; - printBug("Unknown hypervisor vendor: %s", name); + printBug("Unknown hypervisor vendor: '%s'", name); } }