gcontini
2020-10-31 c8f8e0c1f0a3687539a92169735845814e18c187
src/library/os/execution_environment_common.cpp
@@ -20,18 +20,20 @@
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},
                                               {"VITRUAL MACHINE", V_OTHER},
                                                     {"MICROSOFT", HV},
                                                     {"PARALLELS", PARALLELS},
                                                     {"VITRUAL MACHINE", V_OTHER},
                                                     {"INNOTEK GMBH", VIRTUALBOX},
                                               {"POWERVM", V_OTHER},
                                               {"BOCHS", V_OTHER},
                                               {"KVM", KVM}};
                                                     {"POWERVM", V_OTHER},
                                                     {"BOCHS", V_OTHER},
                                                     {"KVM", KVM}};
static LCC_API_VIRTUALIZATION_DETAIL find_in_map(const unordered_map<string, LCC_API_VIRTUALIZATION_DETAIL>& map, const string& data) {
static LCC_API_VIRTUALIZATION_DETAIL find_in_map(const unordered_map<string, LCC_API_VIRTUALIZATION_DETAIL>& map,
                                     const string& data) {
   for (auto it : map) {
      if (data.find(it.first) != string::npos) {
         return it.second;
@@ -67,8 +69,10 @@
         }
      }
   }
   if (result == BARE_TO_METAL && m_cpu_info.is_hypervisor_set()) {
      result = V_OTHER;
   if (result == BARE_TO_METAL) {
      if (m_cpu_info.is_hypervisor_set() || is_cloud()) {
         result = V_OTHER;
      }
   }
   return result;
}
@@ -88,7 +92,8 @@
      if (bios_vendor.find("SEABIOS") != string::npos || bios_description.find("ALIBABA") != string::npos ||
         sys_vendor.find("ALIBABA") != string::npos) {
         result = ALI_CLOUD;
      } else if (sys_vendor.find("GOOGLE") != string::npos || bios_description.find("GOOGLE") != string::npos) {
      } else if (sys_vendor.find("GOOGLE") != string::npos ||
               bios_description.find("GOOGLECOMPUTEENGINE") != string::npos) {
         result = GOOGLE_CLOUD;
      } else if (bios_vendor.find("AWS") != string::npos || bios_description.find("AMAZON") != string::npos ||
               sys_vendor.find("AWS") != string::npos) {