]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
esx: Fix connection to ESX 5.1
authorMartin Kletzander <mkletzan@redhat.com>
Tue, 30 Oct 2012 07:32:37 +0000 (08:32 +0100)
committerCole Robinson <crobinso@redhat.com>
Sun, 9 Dec 2012 20:35:05 +0000 (15:35 -0500)
After separating 5.x and 5.1 versions of ESX, we forgot to add 5.1
into the list of allowed connections, so connections to 5.1 fail since
v1.0.0-rc1-5-g1e7cd39
(cherry picked from commit bab7752c0c6e82139f704b83f381a4c34a7b0f39)

src/esx/esx_driver.c

index 06c6aa8660dde26a15e62d134b43c564a8fa00da..8c97ec7147a18b4ef7232b2fad444dab4cfe917e 100644 (file)
@@ -718,6 +718,7 @@ esxConnectToHost(virConnectPtr conn,
             priv->host->productVersion != esxVI_ProductVersion_ESX41 &&
             priv->host->productVersion != esxVI_ProductVersion_ESX4x &&
             priv->host->productVersion != esxVI_ProductVersion_ESX50 &&
+            priv->host->productVersion != esxVI_ProductVersion_ESX51 &&
             priv->host->productVersion != esxVI_ProductVersion_ESX5x) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("%s is neither an ESX 3.5, 4.x nor 5.x host"),
@@ -847,6 +848,7 @@ esxConnectToVCenter(virConnectPtr conn,
         priv->vCenter->productVersion != esxVI_ProductVersion_VPX41 &&
         priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x &&
         priv->vCenter->productVersion != esxVI_ProductVersion_VPX50 &&
+        priv->vCenter->productVersion != esxVI_ProductVersion_VPX51 &&
         priv->vCenter->productVersion != esxVI_ProductVersion_VPX5x) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("%s is neither a vCenter 2.5, 4.x nor 5.x server"),