]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
Ignore empty CPU vendor string when checking hypervisor.
authorVMware, Inc <>
Wed, 20 Jul 2011 20:52:51 +0000 (13:52 -0700)
committerMarcelo Vanzin <mvanzin@vmware.com>
Wed, 20 Jul 2011 20:52:51 +0000 (13:52 -0700)
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>
open-vm-tools/lib/vmCheck/vmcheck.c

index 975446be97af578a1a2e0047e3473457abfef55d..3e34b1faebef5fcdf4ebaffb3bf6305dfc9f5427 100644 (file)
@@ -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",