From: Doug Goldstein <cardoe@cardoe.com>
Date: Tue, 1 Oct 2013 02:19:13 +0000 (-0500)
Subject: VMware: Do version detection earlier
X-Git-Tag: CVE-2013-4401~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa23f9fcbb428722726cd986ab0f120fc1330a35;p=thirdparty%2Flibvirt.git

VMware: Do version detection earlier

Do VMware version detection earlier as future patches will need the
version information to populate capabilities correctly.
---

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 79954e08a5..0e7a37f493 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -166,6 +166,9 @@ vmwareConnectOpen(virConnectPtr conn,
         goto cleanup;
     }
 
+    if (vmwareExtractVersion(driver) < 0)
+        goto cleanup;
+
     if (!(driver->domains = virDomainObjListNew()))
         goto cleanup;
 
@@ -178,9 +181,6 @@ vmwareConnectOpen(virConnectPtr conn,
     if (vmwareLoadDomains(driver) < 0)
         goto cleanup;
 
-    if (vmwareExtractVersion(driver) < 0)
-        goto cleanup;
-
     conn->privateData = driver;
 
     return VIR_DRV_OPEN_SUCCESS;