Add VMWare hypervisor detection.

Source:
  http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458

diff --git a/fireinfo/__init__.py b/fireinfo/__init__.py
index 7ac7f27075713ccfda09d06f1ac4cb745486d2c7..d74f89788098ebd63664855fd59168926a5f04fc 100644 (file)
--- a/fireinfo/__init__.py
+++ b/fireinfo/__init__.py
@@ -1,3 +1,3 @@
 #!/usr/bin/python
 
-# Empty module so far...
+from system import System

diff --git a/src/fireinfo.c b/src/fireinfo.c
index c9c5700c2fe610a5c4f7e7f664cac6da3abbebfc..850bbab077c950da9a2b297f1d686e9193a5b75e 100644 (file)
--- a/src/fireinfo.c
+++ b/src/fireinfo.c
@@ -51,13 +51,15 @@ enum {
        HYPER_NONE      = 0,
        HYPER_XEN,
        HYPER_KVM,
-       HYPER_MSHV
+       HYPER_MSHV,
+       HYPER_VMWARE
 };
 const char *hv_vendors[] = {
        [HYPER_NONE]    = NULL,
        [HYPER_XEN]     = "Xen",
        [HYPER_KVM]     = "KVM",
-       [HYPER_MSHV]    = "Microsoft"
+       [HYPER_MSHV]    = "Microsoft",
+       [HYPER_VMWARE]  = "VMWare"
 };
 
 /* CPU modes (bits) */
@@ -355,6 +357,8 @@ read_hypervisor_cpuid(struct lscpu_desc *desc)
                desc->hyper = HYPER_KVM;
        else if (!strncmp("Microsoft Hv", hyper_vendor_id, 12))
                desc->hyper = HYPER_MSHV;
+       else if (!strncmp("VMwareVMware", hyper_vendor_id, 12))
+               desc->hyper = HYPER_VMWARE;
 }
 
 #else  /* ! __x86_64__ */