External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-30 17:45:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

esx: Fix connection to ESX 5.1

Browse Source 
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 bab7752c0c)
This commit is contained in:
Martin Kletzander 2012-10-30 08:32:37 +01:00 committed by Cole Robinson
parent 48aaabd99d
commit b29534a6ed
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/esx/esx_driver.c
View File

@ -718,6 +718,7 @@ esxConnectToHost(virConnectPtr conn,
priv->host->productVersion != esxVI_ProductVersion_ESX41 && priv->host->productVersion != esxVI_ProductVersion_ESX41 &&
priv->host->productVersion != esxVI_ProductVersion_ESX4x && priv->host->productVersion != esxVI_ProductVersion_ESX4x &&
priv->host->productVersion != esxVI_ProductVersion_ESX50 && priv->host->productVersion != esxVI_ProductVersion_ESX50 &&
priv->host->productVersion != esxVI_ProductVersion_ESX51 &&
priv->host->productVersion != esxVI_ProductVersion_ESX5x) { priv->host->productVersion != esxVI_ProductVersion_ESX5x) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s is neither an ESX 3.5, 4.x nor 5.x host"), _("%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_VPX41 &&
priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x && priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x &&
priv->vCenter->productVersion != esxVI_ProductVersion_VPX50 && priv->vCenter->productVersion != esxVI_ProductVersion_VPX50 &&
priv->vCenter->productVersion != esxVI_ProductVersion_VPX51 &&
priv->vCenter->productVersion != esxVI_ProductVersion_VPX5x) { priv->vCenter->productVersion != esxVI_ProductVersion_VPX5x) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s is neither a vCenter 2.5, 4.x nor 5.x server"), _("%s is neither a vCenter 2.5, 4.x nor 5.x server"),