diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index e8cee77ae5ccbfded89f418afb236341d230212c..10f1225061ea051f38c2f57052f0e11f5a5b2426 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -4,13 +4,14 @@

The libvirt VMware ESX driver can manage VMware ESX/ESXi 3.5/4.0 and VMware GSX 2.0, also called VMware Server 2.0, and possibly later - versions. + versions. Since 0.8.3 the driver can also + connect to a VMware vCenter 2.5/4.0 (VPX).

Deployment pre-requisites

- None. Any out-of-the-box installation of ESX/GSX should work. No + None. Any out-of-the-box installation of VPX/ESX(i)/GSX should work. No preparations are required on the server side, no libvirtd must be installed on the ESX server. The driver uses version 2.5 of the remote, SOAP based @@ -27,10 +28,11 @@ Some example remote connection URIs for the driver are: 

-esx://example.com                  (ESX over HTTPS)
-gsx://example.com                  (GSX over HTTPS)
-esx://example.com/?transport=http  (ESX over HTTP)
-esx://example.com/?no_verify=1     (ESX over HTTPS, but doesn't verify the server's SSL certificate)
+vpx://example-vcenter.com              (VPX over HTTPS)
+esx://example-esx.com                  (ESX over HTTPS)
+gsx://example-gsx.com                  (GSX over HTTPS)
+esx://example-esx.com/?transport=http  (ESX over HTTP)
+esx://example-esx.com/?no_verify=1     (ESX over HTTPS, but doesn't verify the server's SSL certificate)

Note: In contrast to other drivers, the ESX driver is @@ -43,24 +45,33 @@ esx://example.com/?no_verify=1 (ESX over HTTPS, but doesn't verify the serve

URI Format

- URIs have this general form ('[...]' marks an optional part). + URIs have this general form ([...] marks an optional part). 

 type://[username@]hostname[:port]/[?extraparameters]

The type:// is either esx:// or - gsx:// and the driver selects the default port depending - on it. For ESX the default HTTPS port is 443, for GSX it is 8333. If - the port parameter is given, it overrides the default port. + gsx:// or vpx:// since 0.8.3. + The driver selects the default port depending on the type://. + For esx:// and vpx:// the default HTTPS port + is 443, for gsx:// it is 8333. + If the port parameter is given, it overrides the default port.

Extra parameters

Extra parameters can be added to a URI as part of the query string - (the part following '?'). The driver understands the extra parameters - shown below. + (the part following ?). A single parameter is formed by a + name=value pair. Multiple parameters are separated by + &. +

+
+?no_verify=1&auto_answer=1&proxy=socks://example-proxy.com:23456
+
+

+ The driver understands the extra parameters shown below.

@@ -76,8 +87,9 @@ type://[username@]hostname[:port]/[?extraparameters] http or https @@ -91,6 +103,7 @@ type://[username@]hostname[:port]/[?extraparameters] In order to perform a migration the driver needs to know the VMware vCenter for the ESX server. If set to *, the driver connects to the vCenter known to the ESX server. + This paramater in useful when connecting to an ESX server only. @@ -217,7 +230,7 @@ type://[username@]hostname[:port]/[?extraparameters] To define a new domain the driver converts the domain XML into a VMware VMX file and uploads it to a datastore known to the ESX server. Because multiple datastores may be known to an ESX server the driver - needs to decide to which datastores the VMX file should be uploaded. + needs to decide to which datastore the VMX file should be uploaded. The driver deduces this information from the path of the source of the first file-based harddisk listed in the domain XML.

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 6f3ebcbe537debea5f82afd543cebbe721de402c..3a5854f612f4715803abce8aaee1fb42c68ace6a 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -67,6 +67,11 @@ esxSupportsLongMode(esxPrivate *priv) return priv->supportsLongMode; } + if (priv->host == NULL) { + /* FIXME: Currently no host for a vpx:// connection */ + return esxVI_Boolean_False; + } + if (esxVI_EnsureSession(priv->host) < 0) { return esxVI_Boolean_Undefined; } @@ -148,6 +153,11 @@ esxLookupHostSystemBiosUuid(esxPrivate *priv, unsigned char *uuid) esxVI_ObjectContent *hostSystem = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; + if (priv->host == NULL) { + /* FIXME: Currently no host for a vpx:// connection */ + return 0; + } + if (esxVI_EnsureSession(priv->host) < 0) { return -1; } @@ -280,11 +290,204 @@ esxCapsInit(esxPrivate *priv) +static int +esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, + const char *hostname, int port, + const char *predefinedUsername, + esxUtil_ParsedQuery *parsedQuery, + esxVI_ProductVersion expectedProductVersion, + char **vCenterIpAddress) +{ + int result = -1; + char ipAddress[NI_MAXHOST] = ""; + char *username = NULL; + char *password = NULL; + char *url = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_Boolean inMaintenanceMode = esxVI_Boolean_Undefined; + + if (vCenterIpAddress == NULL || *vCenterIpAddress != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxUtil_ResolveHostname(hostname, ipAddress, NI_MAXHOST) < 0) { + return -1; + } + + if (predefinedUsername != NULL) { + username = strdup(predefinedUsername); + + if (username == NULL) { + virReportOOMError(); + goto cleanup; + } + } else { + username = virRequestUsername(auth, "root", hostname); + + if (username == NULL) { + ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); + goto cleanup; + } + } + + password = virRequestPassword(auth, username, hostname); + + if (password == NULL) { + ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); + goto cleanup; + } + + if (virAsprintf(&url, "%s://%s:%d/sdk", priv->transport, hostname, + port) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_Context_Alloc(&priv->host) < 0 || + esxVI_Context_Connect(priv->host, url, ipAddress, username, password, + parsedQuery) < 0) { + goto cleanup; + } + + if (expectedProductVersion == esxVI_ProductVersion_ESX) { + if (priv->host->productVersion != esxVI_ProductVersion_ESX35 && + priv->host->productVersion != esxVI_ProductVersion_ESX40) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("%s is neither an ESX 3.5 host nor an ESX 4.0 host"), + hostname); + goto cleanup; + } + } else { /* GSX */ + if (priv->host->productVersion != esxVI_ProductVersion_GSX20) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("%s isn't a GSX 2.0 host"), hostname); + goto cleanup; + } + } + + /* Query the host for maintenance mode and vCenter IP address */ + if (esxVI_String_AppendValueListToList(&propertyNameList, + "runtime.inMaintenanceMode\0" + "summary.managementServerIp\0") < 0 || + esxVI_LookupHostSystemByIp(priv->host, ipAddress, propertyNameList, + &hostSystem) < 0 || + esxVI_GetBoolean(hostSystem, "runtime.inMaintenanceMode", + &inMaintenanceMode, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetStringValue(hostSystem, "summary.managementServerIp", + vCenterIpAddress, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + /* Warn if host is in maintenance mode */ + if (inMaintenanceMode == esxVI_Boolean_True) { + VIR_WARN0("The server is in maintenance mode"); + } + + if (*vCenterIpAddress != NULL) { + *vCenterIpAddress = strdup(*vCenterIpAddress); + + if (*vCenterIpAddress == NULL) { + virReportOOMError(); + goto cleanup; + } + } + + result = 0; + + cleanup: + VIR_FREE(password); + VIR_FREE(username); + VIR_FREE(url); + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + + return result; +} + + + +static int +esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, + const char *hostname, int port, + const char *predefinedUsername, + esxUtil_ParsedQuery *parsedQuery) +{ + int result = -1; + char ipAddress[NI_MAXHOST] = ""; + char *username = NULL; + char *password = NULL; + char *url = NULL; + + if (esxUtil_ResolveHostname(hostname, ipAddress, NI_MAXHOST) < 0) { + return -1; + } + + if (predefinedUsername != NULL) { + username = strdup(predefinedUsername); + + if (username == NULL) { + virReportOOMError(); + goto cleanup; + } + } else { + username = virRequestUsername(auth, "administrator", hostname); + + if (username == NULL) { + ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); + goto cleanup; + } + } + + password = virRequestPassword(auth, username, hostname); + + if (password == NULL) { + ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); + goto cleanup; + } + + if (virAsprintf(&url, "%s://%s:%d/sdk", priv->transport, hostname, + port) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_Context_Alloc(&priv->vCenter) < 0 || + esxVI_Context_Connect(priv->vCenter, url, ipAddress, username, + password, parsedQuery) < 0) { + goto cleanup; + } + + if (priv->vCenter->productVersion != esxVI_ProductVersion_VPX25 && + priv->vCenter->productVersion != esxVI_ProductVersion_VPX40) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("%s is neither a vCenter 2.5 server nor a vCenter " + "4.0 server"), hostname); + goto cleanup; + } + + result = 0; + + cleanup: + VIR_FREE(password); + VIR_FREE(username); + VIR_FREE(url); + + return result; +} + + + /* - * URI format: {esx|gsx}://[@][:]/[ ...] + * URI format: {vpx|esx|gsx}://[@][:]/[ ...] * * If no port is specified the default port is set dependent on the scheme and * transport parameter: + * - vpx+http 80 + * - vpx+https 443 * - esx+http 80 * - esx+https 443 * - gsx+http 8222 @@ -292,7 +495,7 @@ esxCapsInit(esxPrivate *priv) * * Optional query parameters: * - transport={http|https} - * - vcenter={|*} + * - vcenter={|*} only useful for an esx:// connection * - no_verify={0|1} * - auto_answer={0|1} * - proxy=[{http|socks|socks4|socks4a|socks5}://][:] @@ -322,19 +525,13 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; esxPrivate *priv = NULL; esxUtil_ParsedQuery *parsedQuery = NULL; - char hostIpAddress[NI_MAXHOST] = ""; + char *potentialVCenterIpAddress = NULL; char vCenterIpAddress[NI_MAXHOST] = ""; - char *url = NULL; - char *vCenter = NULL; - char *username = NULL; - char *password = NULL; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *hostSystem = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - /* Decline if the URI is NULL or the scheme is neither 'esx' nor 'gsx' */ + /* Decline if the URI is NULL or the scheme is not one of {vpx|esx|gsx} */ if (conn->uri == NULL || conn->uri->scheme == NULL || - (STRCASENEQ(conn->uri->scheme, "esx") && + (STRCASENEQ(conn->uri->scheme, "vpx") && + STRCASENEQ(conn->uri->scheme, "esx") && STRCASENEQ(conn->uri->scheme, "gsx"))) { return VIR_DRV_OPEN_DECLINED; } @@ -376,7 +573,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) * distinguish between the situations port == 0 and port != 0 */ if (conn->uri->port == 0) { - if (STRCASEEQ(conn->uri->scheme, "esx")) { + if (STRCASEEQ(conn->uri->scheme, "vpx") || + STRCASEEQ(conn->uri->scheme, "esx")) { if (STRCASEEQ(priv->transport, "https")) { conn->uri->port = 443; } else { @@ -391,194 +589,67 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } } - /* Login to host */ - if (esxUtil_ResolveHostname(conn->uri->server, hostIpAddress, - NI_MAXHOST) < 0) { - goto cleanup; - } - - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->transport, - conn->uri->server, conn->uri->port) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (conn->uri->user != NULL) { - username = strdup(conn->uri->user); - - if (username == NULL) { - virReportOOMError(); - goto cleanup; - } - } else { - username = virRequestUsername(auth, "root", conn->uri->server); - - if (username == NULL) { - ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); - goto cleanup; - } - } - - password = virRequestPassword(auth, username, conn->uri->server); - - if (password == NULL) { - ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); - goto cleanup; - } - - if (esxVI_Context_Alloc(&priv->host) < 0 || - esxVI_Context_Connect(priv->host, url, hostIpAddress, username, - password, parsedQuery) < 0) { - goto cleanup; - } - - if (STRCASEEQ(conn->uri->scheme, "esx")) { - if (priv->host->productVersion != esxVI_ProductVersion_ESX35 && - priv->host->productVersion != esxVI_ProductVersion_ESX40) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("%s is neither an ESX 3.5 host nor an ESX 4.0 host"), - conn->uri->server); + if (STRCASEEQ(conn->uri->scheme, "esx") || + STRCASEEQ(conn->uri->scheme, "gsx")) { + /* Connect to host */ + if (esxConnectToHost(priv, auth, conn->uri->server, conn->uri->port, + conn->uri->user, parsedQuery, + STRCASEEQ(conn->uri->scheme, "esx") + ? esxVI_ProductVersion_ESX + : esxVI_ProductVersion_GSX, + &potentialVCenterIpAddress) < 0) { goto cleanup; } - } else { /* GSX */ - if (priv->host->productVersion != esxVI_ProductVersion_GSX20) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("%s isn't a GSX 2.0 host"), conn->uri->server); - goto cleanup; - } - } - - /* Query the host for maintenance mode and vCenter IP address */ - if (esxVI_String_AppendValueListToList(&propertyNameList, - "runtime.inMaintenanceMode\0" - "summary.managementServerIp\0") < 0 || - esxVI_LookupHostSystemByIp(priv->host, hostIpAddress, propertyNameList, - &hostSystem) < 0) { - goto cleanup; - } - /* Warn if host is in maintenance mode */ - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "runtime.inMaintenanceMode")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Boolean) < 0) { - goto cleanup; - } - - if (dynamicProperty->val->boolean == esxVI_Boolean_True) { - VIR_WARN0("The server is in maintenance mode"); - } - - break; - } - } - - /* Login to vCenter */ - if (parsedQuery->vCenter != NULL) { - VIR_FREE(url); - VIR_FREE(password); - VIR_FREE(username); - - vCenter = strdup(parsedQuery->vCenter); - - if (vCenter == NULL) { - virReportOOMError(); - goto cleanup; - } - - /* If a vCenter is specified resolve the hostname */ - if (STRNEQ(vCenter, "*") && - esxUtil_ResolveHostname(vCenter, vCenterIpAddress, - NI_MAXHOST) < 0) { - goto cleanup; - } - - /* Lookup the vCenter from the ESX host */ - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.managementServerIp")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { + /* Connect to vCenter */ + if (parsedQuery->vCenter != NULL) { + if (STREQ(parsedQuery->vCenter, "*")) { + if (potentialVCenterIpAddress == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("This host is not managed by a vCenter")); goto cleanup; } - /* Get the vCenter IP address or verify the specified one */ - if (STREQ(vCenter, "*")) { - VIR_FREE(vCenter); - - vCenter = strdup(dynamicProperty->val->string); - - if (vCenter == NULL) { - virReportOOMError(); - goto cleanup; - } + if (virStrcpyStatic(vCenterIpAddress, + potentialVCenterIpAddress) == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("vCenter IP address %s too big for destination"), + potentialVCenterIpAddress); + goto cleanup; + } + } else { + if (esxUtil_ResolveHostname(parsedQuery->vCenter, + vCenterIpAddress, NI_MAXHOST) < 0) { + goto cleanup; + } - if (virStrcpyStatic(vCenterIpAddress, - dynamicProperty->val->string) == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("vCenter IP address %s too big for " - "destination"), - dynamicProperty->val->string); - goto cleanup; - } - } else if (STRNEQ(vCenterIpAddress, - dynamicProperty->val->string)) { + if (potentialVCenterIpAddress != NULL && + STRNEQ(vCenterIpAddress, potentialVCenterIpAddress)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("This host is managed by a vCenter with IP " "address %s, but a mismachting vCenter '%s' " "(%s) has been specified"), - dynamicProperty->val->string, vCenter, + potentialVCenterIpAddress, parsedQuery->vCenter, vCenterIpAddress); goto cleanup; } - - break; } - } - - if (STREQ(vCenter, "*")) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("This host is not managed by a vCenter")); - goto cleanup; - } - - if (virAsprintf(&url, "%s://%s/sdk", priv->transport, - vCenter) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_Context_Alloc(&priv->vCenter) < 0) { - goto cleanup; - } - username = virRequestUsername(auth, "administrator", vCenter); - - if (username == NULL) { - ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); - goto cleanup; - } - - password = virRequestPassword(auth, username, vCenter); - - if (password == NULL) { - ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); - goto cleanup; + if (esxConnectToVCenter(priv, auth, vCenterIpAddress, + conn->uri->port, NULL, parsedQuery) < 0) { + goto cleanup; + } } - if (esxVI_Context_Connect(priv->vCenter, url, vCenterIpAddress, - username, password, parsedQuery) < 0) { + priv->primary = priv->host; + } else { /* VPX */ + /* Connect to vCenter */ + if (esxConnectToVCenter(priv, auth, conn->uri->server, conn->uri->port, + conn->uri->user, parsedQuery) < 0) { goto cleanup; } - if (priv->vCenter->productVersion != esxVI_ProductVersion_VPX25 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX40) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("%s is neither a vCenter 2.5 server nor a vCenter " - "4.0 server"), conn->uri->server); - goto cleanup; - } + priv->primary = priv->vCenter; } conn->privateData = priv; @@ -604,12 +675,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } esxUtil_FreeParsedQuery(&parsedQuery); - VIR_FREE(url); - VIR_FREE(vCenter); - VIR_FREE(password); - VIR_FREE(username); - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&hostSystem); + VIR_FREE(potentialVCenterIpAddress); return result; } @@ -622,12 +688,14 @@ esxClose(virConnectPtr conn) esxPrivate *priv = conn->privateData; int result = 0; - if (esxVI_EnsureSession(priv->host) < 0 || - esxVI_Logout(priv->host) < 0) { - result = -1; - } + if (priv->host != NULL) { + if (esxVI_EnsureSession(priv->host) < 0 || + esxVI_Logout(priv->host) < 0) { + result = -1; + } - esxVI_Context_Free(&priv->host); + esxVI_Context_Free(&priv->host); + } if (priv->vCenter != NULL) { if (esxVI_EnsureSession(priv->vCenter) < 0 || @@ -661,6 +729,11 @@ esxSupportsVMotion(esxPrivate *priv) return priv->supportsVMotion; } + if (priv->host == NULL) { + /* FIXME: Currently no host for a vpx:// connection */ + return esxVI_Boolean_False; + } + if (esxVI_EnsureSession(priv->host) < 0) { return esxVI_Boolean_Undefined; } @@ -745,11 +818,11 @@ esxGetVersion(virConnectPtr conn, unsigned long *version) { esxPrivate *priv = conn->privateData; - if (virParseVersionString(priv->host->service->about->version, + if (virParseVersionString(priv->primary->service->about->version, version) < 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Could not parse version number from '%s'"), - priv->host->service->about->version); + priv->primary->service->about->version); return -1; } @@ -770,6 +843,13 @@ esxGetHostname(virConnectPtr conn) const char *domainName = NULL; char *complete = NULL; + if (priv->host == NULL) { + /* FIXME: Currently no host for a vpx:// connection */ + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the hostname for a vpx:// connection")); + return NULL; + } + if (esxVI_EnsureSession(priv->host) < 0) { return NULL; } @@ -865,6 +945,13 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) memset(nodeinfo, 0, sizeof (*nodeinfo)); + if (priv->host == NULL) { + /* FIXME: Currently no host for a vpx:// connection */ + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Nodeinfo is not available for a vpx:// connection")); + return -1; + } + if (esxVI_EnsureSession(priv->host) < 0) { return -1; } @@ -1034,13 +1121,13 @@ esxListDomains(virConnectPtr conn, int *ids, int maxids) return 0; } - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->vmFolder, + esxVI_LookupObjectContentByType(priv->primary, priv->primary->vmFolder, "VirtualMachine", propertyNameList, esxVI_Boolean_True, &virtualMachineList) < 0) { @@ -1090,12 +1177,12 @@ esxNumberOfDomains(virConnectPtr conn) { esxPrivate *priv = conn->privateData; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } return esxVI_LookupNumberOfDomainsByPowerState - (priv->host, esxVI_VirtualMachinePowerState_PoweredOn, + (priv->primary, esxVI_VirtualMachinePowerState_PoweredOn, esxVI_Boolean_False); } @@ -1114,7 +1201,7 @@ esxDomainLookupByID(virConnectPtr conn, int id) unsigned char uuid_candidate[VIR_UUID_BUFLEN]; virDomainPtr domain = NULL; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -1123,7 +1210,7 @@ esxDomainLookupByID(virConnectPtr conn, int id) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->vmFolder, + esxVI_LookupObjectContentByType(priv->primary, priv->primary->vmFolder, "VirtualMachine", propertyNameList, esxVI_Boolean_True, &virtualMachineList) < 0) { @@ -1190,14 +1277,14 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) char *name = NULL; virDomainPtr domain = NULL; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } if (esxVI_String_AppendValueListToList(&propertyNameList, "name\0" "runtime.powerState\0") < 0 || - esxVI_LookupVirtualMachineByUuid(priv->host, uuid, propertyNameList, + esxVI_LookupVirtualMachineByUuid(priv->primary, uuid, propertyNameList, &virtualMachine, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetVirtualMachineIdentity(virtualMachine, &id, &name, NULL) < 0 || @@ -1239,7 +1326,7 @@ esxDomainLookupByName(virConnectPtr conn, const char *name) unsigned char uuid[VIR_UUID_BUFLEN]; virDomainPtr domain = NULL; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -1247,7 +1334,7 @@ esxDomainLookupByName(virConnectPtr conn, const char *name) "configStatus\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_LookupVirtualMachineByName(priv->host, name, propertyNameList, + esxVI_LookupVirtualMachineByName(priv->primary, name, propertyNameList, &virtualMachine, esxVI_Occurrence_OptionalItem) < 0) { goto cleanup; @@ -1297,14 +1384,14 @@ esxDomainSuspend(virDomainPtr domain) esxVI_ManagedObjectReference *task = NULL; esxVI_TaskInfoState taskInfoState; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || esxVI_LookupVirtualMachineByUuidAndPrepareForTask - (priv->host, domain->uuid, propertyNameList, &virtualMachine, + (priv->primary, domain->uuid, propertyNameList, &virtualMachine, priv->autoAnswer) < 0 || esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0) { goto cleanup; @@ -1316,8 +1403,8 @@ esxDomainSuspend(virDomainPtr domain) goto cleanup; } - if (esxVI_SuspendVM_Task(priv->host, virtualMachine->obj, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, domain->uuid, + if (esxVI_SuspendVM_Task(priv->primary, virtualMachine->obj, &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -1350,14 +1437,14 @@ esxDomainResume(virDomainPtr domain) esxVI_ManagedObjectReference *task = NULL; esxVI_TaskInfoState taskInfoState; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || esxVI_LookupVirtualMachineByUuidAndPrepareForTask - (priv->host, domain->uuid, propertyNameList, &virtualMachine, + (priv->primary, domain->uuid, propertyNameList, &virtualMachine, priv->autoAnswer) < 0 || esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0) { goto cleanup; @@ -1368,9 +1455,9 @@ esxDomainResume(virDomainPtr domain) goto cleanup; } - if (esxVI_PowerOnVM_Task(priv->host, virtualMachine->obj, NULL, + if (esxVI_PowerOnVM_Task(priv->primary, virtualMachine->obj, NULL, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, domain->uuid, + esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -1401,13 +1488,13 @@ esxDomainShutdown(virDomainPtr domain) esxVI_String *propertyNameList = NULL; esxVI_VirtualMachinePowerState powerState; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || - esxVI_LookupVirtualMachineByUuid(priv->host, domain->uuid, + esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, propertyNameList, &virtualMachine, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0) { @@ -1420,7 +1507,7 @@ esxDomainShutdown(virDomainPtr domain) goto cleanup; } - if (esxVI_ShutdownGuest(priv->host, virtualMachine->obj) < 0) { + if (esxVI_ShutdownGuest(priv->primary, virtualMachine->obj) < 0) { goto cleanup; } @@ -1444,13 +1531,13 @@ esxDomainReboot(virDomainPtr domain, unsigned int flags ATTRIBUTE_UNUSED) esxVI_String *propertyNameList = NULL; esxVI_VirtualMachinePowerState powerState; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || - esxVI_LookupVirtualMachineByUuid(priv->host, domain->uuid, + esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, propertyNameList, &virtualMachine, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0) { @@ -1463,7 +1550,7 @@ esxDomainReboot(virDomainPtr domain, unsigned int flags ATTRIBUTE_UNUSED) goto cleanup; } - if (esxVI_RebootGuest(priv->host, virtualMachine->obj) < 0) { + if (esxVI_RebootGuest(priv->primary, virtualMachine->obj) < 0) { goto cleanup; } @@ -1562,13 +1649,13 @@ esxDomainGetMaxMemory(virDomainPtr domain) esxVI_DynamicProperty *dynamicProperty = NULL; unsigned long memoryMB = 0; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return 0; } if (esxVI_String_AppendValueToList(&propertyNameList, "config.hardware.memoryMB") < 0 || - esxVI_LookupVirtualMachineByUuid(priv->host, domain->uuid, + esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, propertyNameList, &virtualMachine, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; @@ -1615,12 +1702,12 @@ esxDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) esxVI_ManagedObjectReference *task = NULL; esxVI_TaskInfoState taskInfoState; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_LookupVirtualMachineByUuidAndPrepareForTask - (priv->host, domain->uuid, NULL, &virtualMachine, + (priv->primary, domain->uuid, NULL, &virtualMachine, priv->autoAnswer) < 0 || esxVI_VirtualMachineConfigSpec_Alloc(&spec) < 0 || esxVI_Long_Alloc(&spec->memoryMB) < 0) { @@ -1630,9 +1717,9 @@ esxDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) spec->memoryMB->value = memory / 1024; /* Scale from kilobytes to megabytes */ - if (esxVI_ReconfigVM_Task(priv->host, virtualMachine->obj, spec, + if (esxVI_ReconfigVM_Task(priv->primary, virtualMachine->obj, spec, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, domain->uuid, + esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -1665,12 +1752,12 @@ esxDomainSetMemory(virDomainPtr domain, unsigned long memory) esxVI_ManagedObjectReference *task = NULL; esxVI_TaskInfoState taskInfoState; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_LookupVirtualMachineByUuidAndPrepareForTask - (priv->host, domain->uuid, NULL, &virtualMachine, + (priv->primary, domain->uuid, NULL, &virtualMachine, priv->autoAnswer) < 0 || esxVI_VirtualMachineConfigSpec_Alloc(&spec) < 0 || esxVI_ResourceAllocationInfo_Alloc(&spec->memoryAllocation) < 0 || @@ -1681,9 +1768,9 @@ esxDomainSetMemory(virDomainPtr domain, unsigned long memory) spec->memoryAllocation->limit->value = memory / 1024; /* Scale from kilobytes to megabytes */ - if (esxVI_ReconfigVM_Task(priv->host, virtualMachine->obj, spec, + if (esxVI_ReconfigVM_Task(priv->primary, virtualMachine->obj, spec, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, domain->uuid, + esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -1731,7 +1818,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) memset(info, 0, sizeof (*info)); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } @@ -1740,7 +1827,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) "config.hardware.memoryMB\0" "config.hardware.numCPU\0" "config.memoryAllocation.limit\0") < 0 || - esxVI_LookupVirtualMachineByUuid(priv->host, domain->uuid, + esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, propertyNameList, &virtualMachine, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; @@ -1793,157 +1880,160 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) info->memory = memory_limit < 0 ? info->maxMem : memory_limit; /* Verify the cached 'used CPU time' performance counter ID */ - if (info->state == VIR_DOMAIN_RUNNING && priv->usedCpuTimeCounterId >= 0) { - if (esxVI_Int_Alloc(&counterId) < 0) { - goto cleanup; - } + /* FIXME: Currently no host for a vpx:// connection */ + if (priv->host != NULL) { + if (info->state == VIR_DOMAIN_RUNNING && priv->usedCpuTimeCounterId >= 0) { + if (esxVI_Int_Alloc(&counterId) < 0) { + goto cleanup; + } - counterId->value = priv->usedCpuTimeCounterId; + counterId->value = priv->usedCpuTimeCounterId; - if (esxVI_Int_AppendToList(&counterIdList, counterId) < 0) { - goto cleanup; - } + if (esxVI_Int_AppendToList(&counterIdList, counterId) < 0) { + goto cleanup; + } - if (esxVI_QueryPerfCounter(priv->host, counterIdList, - &perfCounterInfo) < 0) { - goto cleanup; - } + if (esxVI_QueryPerfCounter(priv->host, counterIdList, + &perfCounterInfo) < 0) { + goto cleanup; + } - if (STRNEQ(perfCounterInfo->groupInfo->key, "cpu") || - STRNEQ(perfCounterInfo->nameInfo->key, "used") || - STRNEQ(perfCounterInfo->unitInfo->key, "millisecond")) { - VIR_DEBUG("Cached usedCpuTimeCounterId %d is invalid", - priv->usedCpuTimeCounterId); + if (STRNEQ(perfCounterInfo->groupInfo->key, "cpu") || + STRNEQ(perfCounterInfo->nameInfo->key, "used") || + STRNEQ(perfCounterInfo->unitInfo->key, "millisecond")) { + VIR_DEBUG("Cached usedCpuTimeCounterId %d is invalid", + priv->usedCpuTimeCounterId); - priv->usedCpuTimeCounterId = -1; + priv->usedCpuTimeCounterId = -1; + } + + esxVI_Int_Free(&counterIdList); + esxVI_PerfCounterInfo_Free(&perfCounterInfo); } - esxVI_Int_Free(&counterIdList); - esxVI_PerfCounterInfo_Free(&perfCounterInfo); - } + /* + * Query the PerformanceManager for the 'used CPU time' performance + * counter ID and cache it, if it's not already cached. + */ + if (info->state == VIR_DOMAIN_RUNNING && priv->usedCpuTimeCounterId < 0) { + if (esxVI_QueryAvailablePerfMetric(priv->host, virtualMachine->obj, + NULL, NULL, NULL, + &perfMetricIdList) < 0) { + goto cleanup; + } - /* - * Query the PerformanceManager for the 'used CPU time' performance - * counter ID and cache it, if it's not already cached. - */ - if (info->state == VIR_DOMAIN_RUNNING && priv->usedCpuTimeCounterId < 0) { - if (esxVI_QueryAvailablePerfMetric(priv->host, virtualMachine->obj, - NULL, NULL, NULL, - &perfMetricIdList) < 0) { - goto cleanup; - } + for (perfMetricId = perfMetricIdList; perfMetricId != NULL; + perfMetricId = perfMetricId->_next) { + VIR_DEBUG("perfMetricId counterId %d, instance '%s'", + perfMetricId->counterId->value, perfMetricId->instance); - for (perfMetricId = perfMetricIdList; perfMetricId != NULL; - perfMetricId = perfMetricId->_next) { - VIR_DEBUG("perfMetricId counterId %d, instance '%s'", - perfMetricId->counterId->value, perfMetricId->instance); + counterId = NULL; - counterId = NULL; + if (esxVI_Int_DeepCopy(&counterId, perfMetricId->counterId) < 0 || + esxVI_Int_AppendToList(&counterIdList, counterId) < 0) { + goto cleanup; + } + } - if (esxVI_Int_DeepCopy(&counterId, perfMetricId->counterId) < 0 || - esxVI_Int_AppendToList(&counterIdList, counterId) < 0) { + if (esxVI_QueryPerfCounter(priv->host, counterIdList, + &perfCounterInfoList) < 0) { goto cleanup; } - } - if (esxVI_QueryPerfCounter(priv->host, counterIdList, - &perfCounterInfoList) < 0) { - goto cleanup; - } - - for (perfCounterInfo = perfCounterInfoList; perfCounterInfo != NULL; - perfCounterInfo = perfCounterInfo->_next) { - VIR_DEBUG("perfCounterInfo key %d, nameInfo '%s', groupInfo '%s', " - "unitInfo '%s', rollupType %d, statsType %d", - perfCounterInfo->key->value, - perfCounterInfo->nameInfo->key, - perfCounterInfo->groupInfo->key, - perfCounterInfo->unitInfo->key, - perfCounterInfo->rollupType, - perfCounterInfo->statsType); - - if (STREQ(perfCounterInfo->groupInfo->key, "cpu") && - STREQ(perfCounterInfo->nameInfo->key, "used") && - STREQ(perfCounterInfo->unitInfo->key, "millisecond")) { - priv->usedCpuTimeCounterId = perfCounterInfo->key->value; - break; + for (perfCounterInfo = perfCounterInfoList; perfCounterInfo != NULL; + perfCounterInfo = perfCounterInfo->_next) { + VIR_DEBUG("perfCounterInfo key %d, nameInfo '%s', groupInfo '%s', " + "unitInfo '%s', rollupType %d, statsType %d", + perfCounterInfo->key->value, + perfCounterInfo->nameInfo->key, + perfCounterInfo->groupInfo->key, + perfCounterInfo->unitInfo->key, + perfCounterInfo->rollupType, + perfCounterInfo->statsType); + + if (STREQ(perfCounterInfo->groupInfo->key, "cpu") && + STREQ(perfCounterInfo->nameInfo->key, "used") && + STREQ(perfCounterInfo->unitInfo->key, "millisecond")) { + priv->usedCpuTimeCounterId = perfCounterInfo->key->value; + break; + } } - } - if (priv->usedCpuTimeCounterId < 0) { - VIR_WARN0("Could not find 'used CPU time' performance counter"); + if (priv->usedCpuTimeCounterId < 0) { + VIR_WARN0("Could not find 'used CPU time' performance counter"); + } } - } - - /* - * Query the PerformanceManager for the 'used CPU time' performance - * counter value. - */ - if (info->state == VIR_DOMAIN_RUNNING && priv->usedCpuTimeCounterId >= 0) { - VIR_DEBUG("usedCpuTimeCounterId %d BEGIN", priv->usedCpuTimeCounterId); - if (esxVI_PerfQuerySpec_Alloc(&querySpec) < 0 || - esxVI_Int_Alloc(&querySpec->maxSample) < 0 || - esxVI_PerfMetricId_Alloc(&querySpec->metricId) < 0 || - esxVI_Int_Alloc(&querySpec->metricId->counterId) < 0) { - goto cleanup; - } + /* + * Query the PerformanceManager for the 'used CPU time' performance + * counter value. + */ + if (info->state == VIR_DOMAIN_RUNNING && priv->usedCpuTimeCounterId >= 0) { + VIR_DEBUG("usedCpuTimeCounterId %d BEGIN", priv->usedCpuTimeCounterId); - querySpec->entity = virtualMachine->obj; - querySpec->maxSample->value = 1; - querySpec->metricId->counterId->value = priv->usedCpuTimeCounterId; - querySpec->metricId->instance = (char *)""; - querySpec->format = (char *)"normal"; + if (esxVI_PerfQuerySpec_Alloc(&querySpec) < 0 || + esxVI_Int_Alloc(&querySpec->maxSample) < 0 || + esxVI_PerfMetricId_Alloc(&querySpec->metricId) < 0 || + esxVI_Int_Alloc(&querySpec->metricId->counterId) < 0) { + goto cleanup; + } - if (esxVI_QueryPerf(priv->host, querySpec, - &perfEntityMetricBaseList) < 0) { - querySpec->entity = NULL; - querySpec->metricId->instance = NULL; - querySpec->format = NULL; - goto cleanup; - } + querySpec->entity = virtualMachine->obj; + querySpec->maxSample->value = 1; + querySpec->metricId->counterId->value = priv->usedCpuTimeCounterId; + querySpec->metricId->instance = (char *)""; + querySpec->format = (char *)"normal"; + + if (esxVI_QueryPerf(priv->host, querySpec, + &perfEntityMetricBaseList) < 0) { + querySpec->entity = NULL; + querySpec->metricId->instance = NULL; + querySpec->format = NULL; + goto cleanup; + } - for (perfEntityMetricBase = perfEntityMetricBaseList; - perfEntityMetricBase != NULL; - perfEntityMetricBase = perfEntityMetricBase->_next) { - VIR_DEBUG0("perfEntityMetric ..."); + for (perfEntityMetricBase = perfEntityMetricBaseList; + perfEntityMetricBase != NULL; + perfEntityMetricBase = perfEntityMetricBase->_next) { + VIR_DEBUG0("perfEntityMetric ..."); - perfEntityMetric = - esxVI_PerfEntityMetric_DynamicCast(perfEntityMetricBase); + perfEntityMetric = + esxVI_PerfEntityMetric_DynamicCast(perfEntityMetricBase); - if (perfMetricIntSeries == NULL) { - VIR_ERROR0(_("QueryPerf returned object with unexpected type")); - } + if (perfMetricIntSeries == NULL) { + VIR_ERROR0(_("QueryPerf returned object with unexpected type")); + } - perfMetricIntSeries = - esxVI_PerfMetricIntSeries_DynamicCast(perfEntityMetric->value); + perfMetricIntSeries = + esxVI_PerfMetricIntSeries_DynamicCast(perfEntityMetric->value); - if (perfMetricIntSeries == NULL) { - VIR_ERROR0(_("QueryPerf returned object with unexpected type")); - } + if (perfMetricIntSeries == NULL) { + VIR_ERROR0(_("QueryPerf returned object with unexpected type")); + } - for (; perfMetricIntSeries != NULL; - perfMetricIntSeries = perfMetricIntSeries->_next) { - VIR_DEBUG0("perfMetricIntSeries ..."); + for (; perfMetricIntSeries != NULL; + perfMetricIntSeries = perfMetricIntSeries->_next) { + VIR_DEBUG0("perfMetricIntSeries ..."); - for (value = perfMetricIntSeries->value; - value != NULL; - value = value->_next) { - VIR_DEBUG("value %lld", (long long int)value->value); + for (value = perfMetricIntSeries->value; + value != NULL; + value = value->_next) { + VIR_DEBUG("value %lld", (long long int)value->value); + } } } - } - querySpec->entity = NULL; - querySpec->metricId->instance = NULL; - querySpec->format = NULL; + querySpec->entity = NULL; + querySpec->metricId->instance = NULL; + querySpec->format = NULL; - VIR_DEBUG("usedCpuTimeCounterId %d END", priv->usedCpuTimeCounterId); + VIR_DEBUG("usedCpuTimeCounterId %d END", priv->usedCpuTimeCounterId); - /* - * FIXME: Cannot map between realtive used-cpu-time and absolute - * info->cpuTime - */ + /* + * FIXME: Cannot map between realtive used-cpu-time and absolute + * info->cpuTime + */ + } } result = 0; @@ -1979,7 +2069,7 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) return -1; } - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } @@ -1998,7 +2088,7 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) } if (esxVI_LookupVirtualMachineByUuidAndPrepareForTask - (priv->host, domain->uuid, NULL, &virtualMachine, + (priv->primary, domain->uuid, NULL, &virtualMachine, priv->autoAnswer) < 0 || esxVI_VirtualMachineConfigSpec_Alloc(&spec) < 0 || esxVI_Int_Alloc(&spec->numCPUs) < 0) { @@ -2007,9 +2097,9 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) spec->numCPUs->value = nvcpus; - if (esxVI_ReconfigVM_Task(priv->host, virtualMachine->obj, spec, + if (esxVI_ReconfigVM_Task(priv->primary, virtualMachine->obj, spec, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, domain->uuid, + esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -2046,6 +2136,13 @@ esxDomainGetMaxVcpus(virDomainPtr domain) priv->maxVcpus = -1; + if (priv->host == NULL) { + /* FIXME: Currently no host for a vpx:// connection */ + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("MaxVCPUs value is not available for a vpx:// connection")); + return -1; + } + if (esxVI_EnsureSession(priv->host) < 0) { return -1; } @@ -2093,9 +2190,11 @@ esxDomainDumpXML(virDomainPtr domain, int flags) { esxPrivate *priv = domain->conn->privateData; esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datacenter = NULL; esxVI_ObjectContent *virtualMachine = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; const char *vmPathName = NULL; + char *datacenterName = NULL; char *datastoreName = NULL; char *directoryName = NULL; char *fileName = NULL; @@ -2105,13 +2204,24 @@ esxDomainDumpXML(virDomainPtr domain, int flags) virDomainDefPtr def = NULL; char *xml = NULL; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } + if (esxVI_String_AppendValueToList(&propertyNameList, "name") < 0 || + esxVI_LookupObjectContentByType(priv->primary, priv->primary->datacenter, + "Datacenter", propertyNameList, + esxVI_Boolean_False, &datacenter) < 0 || + esxVI_GetStringValue(datacenter, "name", &datacenterName, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + esxVI_String_Free(&propertyNameList); + if (esxVI_String_AppendValueToList(&propertyNameList, "config.files.vmPathName") < 0 || - esxVI_LookupVirtualMachineByUuid(priv->host, domain->uuid, + esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, propertyNameList, &virtualMachine, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; @@ -2145,7 +2255,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags) virBufferURIEncodeString(&buffer, fileName); virBufferAddLit(&buffer, "?dcPath="); - virBufferURIEncodeString(&buffer, priv->host->datacenter->value); + virBufferURIEncodeString(&buffer, datacenterName); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); @@ -2156,12 +2266,12 @@ esxDomainDumpXML(virDomainPtr domain, int flags) url = virBufferContentAndReset(&buffer); - if (esxVI_Context_DownloadFile(priv->host, url, &vmx) < 0) { + if (esxVI_Context_DownloadFile(priv->primary, url, &vmx) < 0) { goto cleanup; } - def = esxVMX_ParseConfig(priv->host, priv->caps, vmx, datastoreName, - directoryName, priv->host->productVersion); + def = esxVMX_ParseConfig(priv->primary, priv->caps, vmx, datastoreName, + directoryName, priv->primary->productVersion); if (def != NULL) { xml = virDomainDefFormat(def, flags); @@ -2173,6 +2283,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags) } esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datacenter); esxVI_ObjectContent_Free(&virtualMachine); VIR_FREE(datastoreName); VIR_FREE(directoryName); @@ -2201,8 +2312,8 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, return NULL; } - def = esxVMX_ParseConfig(priv->host, priv->caps, nativeConfig, "?", "?", - priv->host->productVersion); + def = esxVMX_ParseConfig(priv->primary, priv->caps, nativeConfig, "?", "?", + priv->primary->productVersion); if (def != NULL) { xml = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE); @@ -2236,8 +2347,8 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, return NULL; } - vmx = esxVMX_FormatConfig(priv->host, priv->caps, def, - priv->host->productVersion); + vmx = esxVMX_FormatConfig(priv->primary, priv->caps, def, + priv->primary->productVersion); virDomainDefFree(def); @@ -2268,14 +2379,14 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) return 0; } - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueListToList(&propertyNameList, "name\0" "runtime.powerState\0") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->vmFolder, + esxVI_LookupObjectContentByType(priv->primary, priv->primary->vmFolder, "VirtualMachine", propertyNameList, esxVI_Boolean_True, &virtualMachineList) < 0) { @@ -2343,12 +2454,12 @@ esxNumberOfDefinedDomains(virConnectPtr conn) { esxPrivate *priv = conn->privateData; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } return esxVI_LookupNumberOfDomainsByPowerState - (priv->host, esxVI_VirtualMachinePowerState_PoweredOn, + (priv->primary, esxVI_VirtualMachinePowerState_PoweredOn, esxVI_Boolean_True); } @@ -2367,14 +2478,14 @@ esxDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) virCheckFlags(0, -1); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || esxVI_LookupVirtualMachineByUuidAndPrepareForTask - (priv->host, domain->uuid, propertyNameList, &virtualMachine, + (priv->primary, domain->uuid, propertyNameList, &virtualMachine, priv->autoAnswer) < 0 || esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0) { @@ -2387,9 +2498,9 @@ esxDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) goto cleanup; } - if (esxVI_PowerOnVM_Task(priv->host, virtualMachine->obj, NULL, + if (esxVI_PowerOnVM_Task(priv->primary, virtualMachine->obj, NULL, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, domain->uuid, + esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -2437,6 +2548,13 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) esxVI_TaskInfoState taskInfoState; virDomainPtr domain = NULL; + if (priv->host == NULL) { + /* FIXME: Currently no host for a vpx:// connection */ + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not define domain with a vpx:// connection")); + return NULL; + } + if (esxVI_EnsureSession(priv->host) < 0) { return NULL; } @@ -2737,7 +2855,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain, return -1; } - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } @@ -2745,7 +2863,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain, "config.cpuAllocation.reservation\0" "config.cpuAllocation.limit\0" "config.cpuAllocation.shares\0") < 0 || - esxVI_LookupVirtualMachineByUuid(priv->host, domain->uuid, + esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, propertyNameList, &virtualMachine, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; @@ -2856,12 +2974,12 @@ esxDomainSetSchedulerParameters(virDomainPtr domain, esxVI_TaskInfoState taskInfoState; int i; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_LookupVirtualMachineByUuidAndPrepareForTask - (priv->host, domain->uuid, NULL, &virtualMachine, + (priv->primary, domain->uuid, NULL, &virtualMachine, priv->autoAnswer) < 0 || esxVI_VirtualMachineConfigSpec_Alloc(&spec) < 0 || esxVI_ResourceAllocationInfo_Alloc(&spec->cpuAllocation) < 0) { @@ -2944,9 +3062,9 @@ esxDomainSetSchedulerParameters(virDomainPtr domain, } } - if (esxVI_ReconfigVM_Task(priv->host, virtualMachine->obj, spec, + if (esxVI_ReconfigVM_Task(priv->primary, virtualMachine->obj, spec, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, domain->uuid, + esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -3152,6 +3270,13 @@ esxNodeGetFreeMemory(virConnectPtr conn) esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_ResourcePoolResourceUsage *resourcePoolResourceUsage = NULL; + if (priv->host == NULL) { + /* FIXME: Currently no host for a vpx:// connection */ + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve free memory for a vpx:// connection")); + return 0; + } + if (esxVI_EnsureSession(priv->host) < 0) { return 0; } @@ -3251,13 +3376,13 @@ esxDomainIsActive(virDomainPtr domain) esxVI_String *propertyNameList = NULL; esxVI_VirtualMachinePowerState powerState; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || - esxVI_LookupVirtualMachineByUuid(priv->host, domain->uuid, + esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, propertyNameList, &virtualMachine, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0) { @@ -3304,7 +3429,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, virCheckFlags(0, NULL); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -3315,9 +3440,9 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, } if (esxVI_LookupVirtualMachineByUuidAndPrepareForTask - (priv->host, domain->uuid, NULL, &virtualMachine, + (priv->primary, domain->uuid, NULL, &virtualMachine, priv->autoAnswer) < 0 || - esxVI_LookupRootSnapshotTreeList(priv->host, domain->uuid, + esxVI_LookupRootSnapshotTreeList(priv->primary, domain->uuid, &rootSnapshotList) < 0 || esxVI_GetSnapshotTreeByName(rootSnapshotList, def->name, &snapshotTree, &snapshotTreeParent, @@ -3331,11 +3456,11 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, goto cleanup; } - if (esxVI_CreateSnapshot_Task(priv->host, virtualMachine->obj, + if (esxVI_CreateSnapshot_Task(priv->primary, virtualMachine->obj, def->name, def->description, esxVI_Boolean_True, esxVI_Boolean_False, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, domain->uuid, + esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -3374,11 +3499,11 @@ esxDomainSnapshotDumpXML(virDomainSnapshotPtr snapshot, memset(&def, 0, sizeof (def)); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } - if (esxVI_LookupRootSnapshotTreeList(priv->host, snapshot->domain->uuid, + if (esxVI_LookupRootSnapshotTreeList(priv->primary, snapshot->domain->uuid, &rootSnapshotList) < 0 || esxVI_GetSnapshotTreeByName(rootSnapshotList, snapshot->name, &snapshotTree, &snapshotTreeParent, @@ -3419,11 +3544,11 @@ esxDomainSnapshotNum(virDomainPtr domain, unsigned int flags) virCheckFlags(0, -1); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } - if (esxVI_LookupRootSnapshotTreeList(priv->host, domain->uuid, + if (esxVI_LookupRootSnapshotTreeList(priv->primary, domain->uuid, &rootSnapshotTreeList) < 0) { return -1; } @@ -3456,11 +3581,11 @@ esxDomainSnapshotListNames(virDomainPtr domain, char **names, int nameslen, return 0; } - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } - if (esxVI_LookupRootSnapshotTreeList(priv->host, domain->uuid, + if (esxVI_LookupRootSnapshotTreeList(priv->primary, domain->uuid, &rootSnapshotTreeList) < 0) { return -1; } @@ -3486,11 +3611,11 @@ esxDomainSnapshotLookupByName(virDomainPtr domain, const char *name, virCheckFlags(0, NULL); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } - if (esxVI_LookupRootSnapshotTreeList(priv->host, domain->uuid, + if (esxVI_LookupRootSnapshotTreeList(priv->primary, domain->uuid, &rootSnapshotTreeList) < 0 || esxVI_GetSnapshotTreeByName(rootSnapshotTreeList, name, &snapshotTree, &snapshotTreeParent, @@ -3516,11 +3641,11 @@ esxDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) virCheckFlags(0, -1); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } - if (esxVI_LookupCurrentSnapshotTree(priv->host, domain->uuid, + if (esxVI_LookupCurrentSnapshotTree(priv->primary, domain->uuid, ¤tSnapshotTree, esxVI_Occurrence_OptionalItem) < 0) { return -1; @@ -3545,11 +3670,11 @@ esxDomainSnapshotCurrent(virDomainPtr domain, unsigned int flags) virCheckFlags(0, NULL); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } - if (esxVI_LookupCurrentSnapshotTree(priv->host, domain->uuid, + if (esxVI_LookupCurrentSnapshotTree(priv->primary, domain->uuid, ¤tSnapshotTree, esxVI_Occurrence_RequiredItem) < 0) { return NULL; @@ -3577,11 +3702,11 @@ esxDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, unsigned int flags) virCheckFlags(0, -1); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } - if (esxVI_LookupRootSnapshotTreeList(priv->host, snapshot->domain->uuid, + if (esxVI_LookupRootSnapshotTreeList(priv->primary, snapshot->domain->uuid, &rootSnapshotList) < 0 || esxVI_GetSnapshotTreeByName(rootSnapshotList, snapshot->name, &snapshotTree, &snapshotTreeParent, @@ -3589,9 +3714,9 @@ esxDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, unsigned int flags) goto cleanup; } - if (esxVI_RevertToSnapshot_Task(priv->host, snapshotTree->snapshot, NULL, + if (esxVI_RevertToSnapshot_Task(priv->primary, snapshotTree->snapshot, NULL, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, snapshot->domain->uuid, + esxVI_WaitForTaskCompletion(priv->primary, task, snapshot->domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -3627,7 +3752,7 @@ esxDomainSnapshotDelete(virDomainSnapshotPtr snapshot, unsigned int flags) virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN, -1); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } @@ -3635,7 +3760,7 @@ esxDomainSnapshotDelete(virDomainSnapshotPtr snapshot, unsigned int flags) removeChildren = esxVI_Boolean_True; } - if (esxVI_LookupRootSnapshotTreeList(priv->host, snapshot->domain->uuid, + if (esxVI_LookupRootSnapshotTreeList(priv->primary, snapshot->domain->uuid, &rootSnapshotList) < 0 || esxVI_GetSnapshotTreeByName(rootSnapshotList, snapshot->name, &snapshotTree, &snapshotTreeParent, @@ -3643,9 +3768,9 @@ esxDomainSnapshotDelete(virDomainSnapshotPtr snapshot, unsigned int flags) goto cleanup; } - if (esxVI_RemoveSnapshot_Task(priv->host, snapshotTree->snapshot, + if (esxVI_RemoveSnapshot_Task(priv->primary, snapshotTree->snapshot, removeChildren, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, snapshot->domain->uuid, + esxVI_WaitForTaskCompletion(priv->primary, task, snapshot->domain->uuid, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } diff --git a/src/esx/esx_private.h b/src/esx/esx_private.h index 19955a5c4f1a021943b3c3d3feb2c7d3871c892b..6c7edb19415be424be0371c63f2a63d1d9480545 100644 --- a/src/esx/esx_private.h +++ b/src/esx/esx_private.h @@ -33,6 +33,7 @@ __LINE__, __VA_ARGS__) typedef struct _esxPrivate { + esxVI_Context *primary; /* points to host or vCenter */ esxVI_Context *host; esxVI_Context *vCenter; virCapsPtr caps; diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 98e713778e7d4a4945c079d76a3fdd5ff12e2480..44d7d850d57ffcb4368cf61c081b32bfee8f8713 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -74,11 +74,11 @@ esxNumberOfStoragePools(virConnectPtr conn) esxVI_ObjectContent *datastoreList = NULL; esxVI_ObjectContent *datastore = NULL; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } - if (esxVI_LookupObjectContentByType(priv->host, priv->host->datacenter, + if (esxVI_LookupObjectContentByType(priv->primary, priv->primary->datacenter, "Datastore", NULL, esxVI_Boolean_True, &datastoreList) < 0) { return -1; @@ -117,13 +117,13 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) return 0; } - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->datacenter, + esxVI_LookupObjectContentByType(priv->primary, priv->primary->datacenter, "Datastore", propertyNameList, esxVI_Boolean_True, &datastoreList) < 0) { @@ -209,7 +209,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) char *realName = NULL; virStoragePoolPtr pool = NULL; - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -217,7 +217,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) "summary.accessible\0" "summary.name\0" "summary.url\0") < 0 || - esxVI_LookupDatastoreByName(priv->host, name, + esxVI_LookupDatastoreByName(priv->primary, name, propertyNameList, &datastore, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetBoolean(datastore, "summary.accessible", @@ -242,7 +242,8 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) * * The 'summary.url' property of an inaccessible datastore is invalid. */ - if (accessible == esxVI_Boolean_True && + /* FIXME: Need to handle this for a vpx:// connection */ + if (accessible == esxVI_Boolean_True && priv->host != NULL && priv->host->productVersion & esxVI_ProductVersion_ESX) { if (esxVI_GetStringValue(datastore, "summary.url", &summaryUrl, esxVI_Occurrence_RequiredItem) < 0) { @@ -307,7 +308,9 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) char *name = NULL; virStoragePoolPtr pool = NULL; - if (! (priv->host->productVersion & esxVI_ProductVersion_ESX)) { + /* FIXME: Need to handle this for a vpx:// connection */ + if (priv->host == NULL || + ! (priv->host->productVersion & esxVI_ProductVersion_ESX)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Lookup by UUID is supported on ESX only")); return NULL; @@ -389,13 +392,13 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) virCheckFlags(0, -1); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } - if (esxVI_LookupDatastoreByName(priv->host, pool->name, NULL, &datastore, + if (esxVI_LookupDatastoreByName(priv->primary, pool->name, NULL, &datastore, esxVI_Occurrence_RequiredItem) < 0 || - esxVI_RefreshDatastore(priv->host, datastore->obj) < 0) { + esxVI_RefreshDatastore(priv->primary, datastore->obj) < 0) { goto cleanup; } @@ -421,7 +424,7 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info) memset(info, 0, sizeof (*info)); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } @@ -429,7 +432,7 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info) "summary.accessible\0" "summary.capacity\0" "summary.freeSpace\0") < 0 || - esxVI_LookupDatastoreByName(priv->host, pool->name, + esxVI_LookupDatastoreByName(priv->primary, pool->name, propertyNameList, &datastore, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetBoolean(datastore, "summary.accessible", @@ -494,7 +497,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) memset(&def, 0, sizeof (def)); - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -503,7 +506,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) "summary.capacity\0" "summary.freeSpace\0" "info\0") < 0 || - esxVI_LookupDatastoreByName(priv->host, pool->name, + esxVI_LookupDatastoreByName(priv->primary, pool->name, propertyNameList, &datastore, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetBoolean(datastore, "summary.accessible", diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 9035233b9103b9716120eb0fa25dbc90e1a1a591..e075149a659745be4f2212a49a4615a4f66259c9 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -1188,6 +1188,7 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, */ switch (productVersion) { case esxVI_ProductVersion_ESX35: + case esxVI_ProductVersion_VPX25: if (virtualHW_version != 4) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be 4 " @@ -1200,6 +1201,7 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, case esxVI_ProductVersion_GSX20: case esxVI_ProductVersion_ESX40: + case esxVI_ProductVersion_VPX40: if (virtualHW_version != 4 && virtualHW_version != 7) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be 4 or 7 " diff --git a/src/libvirt.c b/src/libvirt.c index d1b210d08213b01aad87008ec61352bfed296dfc..3ec57246674282241afd1c71e184a04362d4a075 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1224,6 +1224,7 @@ do_open (const char *name, STRCASEEQ(ret->uri->scheme, "phyp") || #endif #ifndef WITH_ESX + STRCASEEQ(ret->uri->scheme, "vpx") || STRCASEEQ(ret->uri->scheme, "esx") || STRCASEEQ(ret->uri->scheme, "gsx") || #endif
- Overrides the default HTTPS transport. For ESX the default - HTTP port is 80, for GSX it is 8222. + Overrides the default HTTPS transport. For esx:// + and vpx:// the default HTTP port is 80, for + gsx:// it is 8222.