From: VMware, Inc <>
Date: Wed, 20 Jul 2011 20:52:51 +0000 (-0700)
Subject: Ignore empty CPU vendor string when checking hypervisor.
X-Git-Tag: 2011.07.19-450511~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bed6f1369ca6e9c2c7fbaf4205d86e50f219c5f;p=thirdparty%2Fopen-vm-tools.git

Ignore empty CPU vendor string when checking hypervisor.

This should work around an issue filed in the Ubuntu tracker that says
our code is not detecting a VM running in Server 2.0.

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

diff --git a/open-vm-tools/lib/vmCheck/vmcheck.c b/open-vm-tools/lib/vmCheck/vmcheck.c
index 975446be9..3e34b1fae 100644
--- a/open-vm-tools/lib/vmCheck/vmcheck.c
+++ b/open-vm-tools/lib/vmCheck/vmcheck.c
@@ -258,6 +258,7 @@ VmCheck_IsVirtualWorld(void)
 
    hypervisorSig = Hostinfo_HypervisorCPUIDSig();
    if (hypervisorSig != NULL &&
+       *hypervisorSig != '\0' &&
        strcmp(hypervisorSig, CPUID_VMWARE_HYPERVISOR_VENDOR_STRING) != 0) {
       free(hypervisorSig);
       Debug("%s: detected non-VMware hypervisor (%s).\n",