From 469d6ff29ebc8bed44458695186d57bfed0edb6c Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: ćšć, 20 5æ 2021 13:51:10 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop
---
src/library/os/execution_environment_common.cpp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/library/os/execution_environment_common.cpp b/src/library/os/execution_environment_common.cpp
index 636119e..953c0bc 100644
--- a/src/library/os/execution_environment_common.cpp
+++ b/src/library/os/execution_environment_common.cpp
@@ -20,11 +20,12 @@
const unordered_map<string, LCC_API_VIRTUALIZATION_DETAIL> virtual_cpu_names{
{"bhyve bhyve ", V_OTHER}, {"KVM", KVM}, {"MICROSOFT", HV}, {" lrpepyh vr", HV},
- {"prl hyperv ", V_OTHER}, {"VMWARE", VMWARE}, {"XenVMMXenVMM", V_XEN}, {"ACRNACRNACRN", V_OTHER},
+ {"prl hyperv ", PARALLELS}, {"VMWARE", VMWARE}, {"XenVMMXenVMM", V_XEN}, {"ACRNACRNACRN", V_OTHER},
{"VBOX", VIRTUALBOX}};
const unordered_map<string, LCC_API_VIRTUALIZATION_DETAIL> vm_vendors{{"VMWARE", VMWARE},
{"MICROSOFT", HV},
+ {"PARALLELS", PARALLELS},
{"VITRUAL MACHINE", V_OTHER},
{"INNOTEK GMBH", VIRTUALBOX},
{"POWERVM", V_OTHER},
@@ -97,8 +98,8 @@
} else if (bios_vendor.find("AWS") != string::npos || bios_description.find("AMAZON") != string::npos ||
sys_vendor.find("AWS") != string::npos) {
result = AWS;
- } else if (bios_description.find("HP-COMPAQ") != string::npos || bios_description.find("ASUS") ||
- bios_description.find("DELL")) {
+ } else if (bios_description.find("HP-COMPAQ") != string::npos ||
+ bios_description.find("ASUS") != string::npos || bios_description.find("DELL") != string::npos) {
result = ON_PREMISE;
}
}
--
Gitblit v1.9.1