From 4508c70ba686df65b79174dbfea3840f998c05d1 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 26 4月 2020 19:22:44 +0800
Subject: [PATCH] better vm detection
---
src/inspector/inspector.cpp | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index dd44f76..3ec672c 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -23,10 +23,17 @@
{HV, "Microsoft Hypervisor"},
{V_OTHER, "Other type of vm"}};
-const unordered_map<LCC_API_VIRTUALIZATION_SUMMARY, string> descByVirt = {
+const unordered_map<int, string> descByVirt = {
{LCC_API_VIRTUALIZATION_SUMMARY::NONE, "No virtualization"},
- {LCC_API_VIRTUALIZATION_SUMMARY::VM, "VM"},
+ {LCC_API_VIRTUALIZATION_SUMMARY::VM, "Virtual machine"},
{LCC_API_VIRTUALIZATION_SUMMARY::CONTAINER, "Container"}};
+
+const unordered_map<int, string> descByCloudProvider = {{PROV_UNKNOWN, "Provider unknown"},
+ {ON_PREMISE, "On premise hardware (no cloud)"},
+ {GOOGLE_CLOUD, "Google Cloud"},
+ {AZURE_CLOUD, "Microsoft Azure"},
+ {AWS, "Amazon AWS"},
+ {ALI_CLOUD, "Alibaba Cloud (Chinese cloud provider)"}};
const unordered_map<int, string> stringByEventType = {
{LICENSE_OK, "OK "},
@@ -68,15 +75,14 @@
}
cout << "Virtualiz. class :" << descByVirt.find(exec_env_info.virtualization)->second << endl;
cout << "Virtualiz. detail:" << descByVirtDetail.find(exec_env_info.virtualization_detail)->second << endl;
- cout << "Cloud provider :" << exec_env_info.cloud_provider << endl << "=============" << endl;
- ;
+ cout << "Cloud provider :" << descByCloudProvider.find(exec_env_info.cloud_provider)->second << endl
+ << "=============" << endl;
license::os::CpuInfo cpu;
cout << "Cpu Vendor :" << cpu.vendor() << endl;
cout << "Cpu Brand :" << cpu.brand() << endl;
cout << "Cpu hypervisor :" << cpu.is_hypervisor_set() << endl;
cout << "Cpu model :0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
license::os::DmiInfo dmi_info;
-
cout << "Bios vendor :" << dmi_info.bios_vendor() << endl;
cout << "Bios description:" << dmi_info.bios_description() << endl;
cout << "System vendor :" << dmi_info.sys_vendor() << endl << endl;
--
Gitblit v1.9.1