Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index b56fcbfc888ca4bb6560a99eb0f9f93fa7e8e409..e646fd24837e9894352caa64b2276c16a2866204 100644 (file)
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -182,7 +182,9 @@ typedef enum {
 #define CPUID_CYRIX_VENDOR_STRING       "CyriteadxIns"
 #define CPUID_VIA_VENDOR_STRING         "CentaulsaurH"
 #define CPUID_HYPERV_HYPERVISOR_VENDOR_STRING  "Microsoft Hv"
+#define CPUID_KVM_HYPERVISOR_VENDOR_STRING     "KVMKVMKVM\0\0\0"
 #define CPUID_VMWARE_HYPERVISOR_VENDOR_STRING  "VMwareVMware"
+#define CPUID_XEN_HYPERVISOR_VENDOR_STRING     "XenVMMXenVMM"
 #define CPUID_INTEL_VENDOR_STRING_FIXED "GenuineIntel"
 #define CPUID_AMD_VENDOR_STRING_FIXED   "AuthenticAMD"
 #define CPUID_CYRIX_VENDOR_STRING_FIXED "CyrixInstead"

diff --git a/open-vm-tools/lib/user/hostinfo.c b/open-vm-tools/lib/user/hostinfo.c
index 7167b0754e86c9900e23c475ad63ee0d7a0c38b7..8de66711dcae473a6f0898875c3c13c530df0b65 100644 (file)
--- a/open-vm-tools/lib/user/hostinfo.c
+++ b/open-vm-tools/lib/user/hostinfo.c
@@ -322,7 +322,6 @@ Hostinfo_TouchXen(void)
 {
 #ifdef linux
 #define XEN_CPUID 0x40000000
-#define XEN_STRING "XenVMMXenVMM"
    CPUIDRegs regs;
    uint32 name[4];
 
@@ -343,7 +342,7 @@ Hostinfo_TouchXen(void)
    name[1] = regs.ecx;
    name[2] = regs.edx;
    name[3] = 0;
-   if (0 == strcmp(XEN_STRING, (const char*)name)) {
+   if (0 == strcmp(CPUID_XEN_HYPERVISOR_VENDOR_STRING, (const char*)name)) {
       return TRUE;
    }