From: Martin Kletzander Date: Tue, 30 Oct 2012 07:32:37 +0000 (+0100) Subject: esx: Fix connection to ESX 5.1 X-Git-Tag: v0.10.2.2~64 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b29534a6ed16454cc39d358e37742dbd7891f01b;p=thirdparty%2Flibvirt.git esx: Fix connection to ESX 5.1 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) --- diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 06c6aa8660..8c97ec7147 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -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"),