- Devel - libvirt List Archives

[libvirt] [PATCH] esx: Restrict vpx:// to handle a single host in a vCenter
by Matthias Bolte 02 Aug '10

02 Aug '10

Now a vpx:// connection has an explicitly specified host. This allows to enabled several functions for a vpx:// connection again, like host UUID, hostname, general node info, max vCPU count, free memory, migration and defining new domains. Lookup datacenter, compute resource, resource pool and host system once and cache them. This simplifies the rest of the code and reduces overall HTTP(S) traffic a bit. esx:// and vpx:// can be mixed freely for a migration. Ensure that migration source and destination refer to the same vCenter. Also directly encode the resource pool and host system object IDs into the migration URI in the prepare function. Then directly build managed object references in the perform function instead of re-looking up already known information. --- docs/drvesx.html.in | 33 +++- src/esx/esx_driver.c | 360 ++++++++++---------------- src/esx/esx_storage_driver.c | 24 +-- src/esx/esx_vi.c | 588 ++++++++++++++++++++++++++---------------- src/esx/esx_vi.h | 26 ++- src/esx/esx_vmx.c | 4 + 6 files changed, 561 insertions(+), 474 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 4ae7a51..dfc91bb 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -28,7 +28,7 @@ Some example remote connection URIs for the driver are: </p> <pre> -vpx://example-vcenter.com (VPX over HTTPS) +vpx://example-vcenter.com/dc1/srv1 (VPX over HTTPS, select ESX server 'srv1' in datacenter 'dc1') esx://example-esx.com (ESX over HTTPS) gsx://example-gsx.com (GSX over HTTPS) esx://example-esx.com/?transport=http (ESX over HTTP) @@ -48,7 +48,7 @@ esx://example-esx.com/?no_verify=1 (ESX over HTTPS, but doesn't verify the s URIs have this general form (<code>[...]</code> marks an optional part). </p> <pre> -type://[username@]hostname[:port]/[?extraparameters] +type://[username@]hostname[:port]/[datacenter[/cluster]/server][?extraparameters] </pre> <p> The <code>type://</code> is either <code>esx://</code> or @@ -58,6 +58,20 @@ type://[username@]hostname[:port]/[?extraparameters] is 443, for <code>gsx://</code> it is 8333. If the port parameter is given, it overrides the default port. </p> + <p> + A <code>vpx://</code> connection is currently restricted to a single + ESX server. This might be relaxed in the future. The path part of the + URI is used to specify the datacenter and the ESX server in it. If the + ESX server is part of a cluster then the cluster has to be specified too. + </p> + <p> + An example: ESX server <code>example-esx.com</code> is managed by + vCenter <code>example-vcenter.com</code> and part of cluster + <code>cluster1</code>. This cluster is part of datacenter <code>dc1</code>. + </p> +<pre> +vpx://example-vcenter.com/dc1/cluster1/example-esx.com +</pre> <h4>Extra parameters</h4> @@ -588,7 +602,7 @@ ethernet0.address = "00:50:56:25:48:C7" esx://example.com/?vcenter=example-vcenter.com </pre> <p> - Here an example how to migrate the domain <code>Fedora11</code> from + Here's an example how to migrate the domain <code>Fedora11</code> from ESX server <code>example-src.com</code> to ESX server <code>example-dst.com</code> implicitly involving vCenter <code>example-vcenter.com</code> using <code>virsh</code>. @@ -604,6 +618,19 @@ Enter root password for example-dst.com: Enter username for example-vcenter.com [administrator]: Enter administrator password for example-vcenter.com: </pre> + <p> + <span class="since">Since 0.8.3</span> you can directly connect to a vCenter. + This simplifies migration a bit. Here's the same migration as above but + using <code>vpx://</code> connections and assuming both ESX server are in + datacenter <code>dc1</code> and aren't part of a cluster. + </p> +<pre> +$ virsh -c vpx://example-vcenter.com/dc1/example-src.com migrate Fedora11 vpx://example-vcenter.com/dc1/example-dst.com +Enter username for example-vcenter.com [administrator]: +Enter administrator password for example-vcenter.com: +Enter username for example-vcenter.com [administrator]: +Enter administrator password for example-vcenter.com: +</pre> <h2><a name="scheduler">Scheduler configuration</a></h2> diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 3bdc551..fd87078 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -67,20 +67,14 @@ 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) { + if (esxVI_EnsureSession(priv->primary) < 0) { return esxVI_Boolean_Undefined; } if (esxVI_String_AppendValueToList(&propertyNameList, "hardware.cpuFeature") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -153,20 +147,14 @@ 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) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "hardware.systemInfo.uuid") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -236,7 +224,7 @@ esxCapsInit(esxPrivate *priv) } virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x00, 0x0c, 0x29 }); - virCapabilitiesAddHostMigrateTransport(caps, "esx"); + virCapabilitiesAddHostMigrateTransport(caps, "vpxmigr"); caps->hasWideScsiBus = true; @@ -347,7 +335,8 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, if (esxVI_Context_Alloc(&priv->host) < 0 || esxVI_Context_Connect(priv->host, url, ipAddress, username, password, - parsedUri) < 0) { + parsedUri) < 0 || + esxVI_Context_LookupObjectsByPath(priv->host, parsedUri) < 0) { goto cleanup; } @@ -373,8 +362,8 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, if (esxVI_String_AppendValueListToList(&propertyNameList, "runtime.inMaintenanceMode\0" "summary.managementServerIp\0") < 0 || - esxVI_LookupHostSystemByIp(priv->host, ipAddress, propertyNameList, - &hostSystem) < 0 || + esxVI_LookupHostSystemProperties(priv->host, propertyNameList, + &hostSystem) < 0 || esxVI_GetBoolean(hostSystem, "runtime.inMaintenanceMode", &inMaintenanceMode, esxVI_Occurrence_RequiredItem) < 0 || @@ -416,6 +405,7 @@ static int esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, const char *hostname, int port, const char *predefinedUsername, + const char *hostSystemIpAddress, esxUtil_ParsedUri *parsedUri) { int result = -1; @@ -424,6 +414,14 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, char *password = NULL; char *url = NULL; + if (hostSystemIpAddress == NULL && + (parsedUri->path_datacenter == NULL || + parsedUri->path_computeResource == NULL)) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Path has to specify the datacenter and compute resource")); + return -1; + } + if (esxUtil_ResolveHostname(hostname, ipAddress, NI_MAXHOST) < 0) { return -1; } @@ -473,6 +471,17 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, goto cleanup; } + if (hostSystemIpAddress != NULL) { + if (esxVI_Context_LookupObjectsByHostSystemIp(priv->vCenter, + hostSystemIpAddress) < 0) { + goto cleanup; + } + } else { + if (esxVI_Context_LookupObjectsByPath(priv->vCenter, parsedUri) < 0) { + goto cleanup; + } + } + result = 0; cleanup: @@ -486,7 +495,8 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, /* - * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<query parameter> ...] + * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<path>][?<query parameter> ...] + * <path> = <datacenter>/<computeresource>[/<hostsystem>] * * If no port is specified the default port is set dependent on the scheme and * transport parameter: @@ -497,6 +507,11 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, * - gsx+http 8222 * - gsx+https 8333 * + * For a vpx:// connection <path> references a host managed by the vCenter. + * In case the host is part of a cluster then <computeresource> is the cluster + * name. Otherwise <computeresource> and <hostsystem> are equal and the later + * can be omitted. + * * Optional query parameters: * - transport={http|https} * - vcenter={<vcenter>|*} only useful for an esx:// connection @@ -508,7 +523,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, * * The vcenter parameter is only necessary for migration, because the vCenter * server is in charge to initiate a migration between two ESX hosts. The - * vcenter parameter can be set to an explicity hostname or to *. If set to *, + * vcenter parameter can be set to an explicitly hostname or to *. If set to *, * the driver will check if the ESX host is managed by a vCenter and connect to * it. If the ESX host is not managed by a vCenter an error is reported. * @@ -635,7 +650,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } if (esxConnectToVCenter(priv, auth, vCenterIpAddress, - conn->uri->port, NULL, parsedUri) < 0) { + conn->uri->port, NULL, + priv->host->ipAddress, parsedUri) < 0) { goto cleanup; } } @@ -644,7 +660,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } else { /* VPX */ /* Connect to vCenter */ if (esxConnectToVCenter(priv, auth, conn->uri->server, conn->uri->port, - conn->uri->user, parsedUri) < 0) { + conn->uri->user, NULL, parsedUri) < 0) { goto cleanup; } @@ -722,26 +738,19 @@ esxSupportsVMotion(esxPrivate *priv) { esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; if (priv->supportsVMotion != esxVI_Boolean_Undefined) { 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) { + if (esxVI_EnsureSession(priv->primary) < 0) { return esxVI_Boolean_Undefined; } if (esxVI_String_AppendValueToList(&propertyNameList, "capability.vmotionSupported") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -751,19 +760,10 @@ esxSupportsVMotion(esxPrivate *priv) goto cleanup; } - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "capability.vmotionSupported")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Boolean) < 0) { - goto cleanup; - } - - priv->supportsVMotion = dynamicProperty->val->boolean; - break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); - } + if (esxVI_GetBoolean(hostSystem, "capability.vmotionSupported", + &priv->supportsVMotion, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; } cleanup: @@ -842,14 +842,7 @@ 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) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -857,9 +850,8 @@ esxGetHostname(virConnectPtr conn) (&propertyNameList, "config.network.dnsConfig.hostName\0" "config.network.dnsConfig.domainName\0") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -944,14 +936,7 @@ 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) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } @@ -963,9 +948,8 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) "hardware.memorySize\0" "hardware.numaInfo.numNodes\0" "summary.hardware.cpuModel\0") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -1126,10 +1110,8 @@ esxListDomains(virConnectPtr conn, int *ids, int maxids) if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || - esxVI_LookupObjectContentByType(priv->primary, priv->primary->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, + &virtualMachineList) < 0) { goto cleanup; } @@ -1209,10 +1191,8 @@ esxDomainLookupByID(virConnectPtr conn, int id) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_LookupObjectContentByType(priv->primary, priv->primary->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, + &virtualMachineList) < 0) { goto cleanup; } @@ -2142,22 +2122,14 @@ 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) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "capability.maxSupportedVcpus") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -2196,11 +2168,8 @@ 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 *vmPathName = NULL; char *datastoreName = NULL; char *directoryName = NULL; char *fileName = NULL; @@ -2214,38 +2183,16 @@ esxDomainDumpXML(virDomainPtr domain, int flags) 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->primary, domain->uuid, propertyNameList, &virtualMachine, - esxVI_Occurrence_RequiredItem) < 0) { + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetStringValue(virtualMachine, "config.files.vmPathName", + &vmPathName, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - for (dynamicProperty = virtualMachine->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "config.files.vmPathName")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { - goto cleanup; - } - - vmPathName = dynamicProperty->val->string; - break; - } - } - if (esxUtil_ParseDatastoreRelatedPath(vmPathName, &datastoreName, &directoryName, &fileName) < 0) { goto cleanup; @@ -2261,7 +2208,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags) virBufferURIEncodeString(&buffer, fileName); virBufferAddLit(&buffer, "?dcPath="); - virBufferURIEncodeString(&buffer, datacenterName); + virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); @@ -2289,7 +2236,6 @@ esxDomainDumpXML(virDomainPtr domain, int flags) } esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datacenter); esxVI_ObjectContent_Free(&virtualMachine); VIR_FREE(datastoreName); VIR_FREE(directoryName); @@ -2392,10 +2338,8 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) if (esxVI_String_AppendValueListToList(&propertyNameList, "name\0" "runtime.powerState\0") < 0 || - esxVI_LookupObjectContentByType(priv->primary, priv->primary->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, + &virtualMachineList) < 0) { goto cleanup; } @@ -2557,14 +2501,7 @@ 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) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -2577,7 +2514,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } /* Check if an existing domain should be edited */ - if (esxVI_LookupVirtualMachineByUuid(priv->host, def->uuid, NULL, + if (esxVI_LookupVirtualMachineByUuid(priv->primary, def->uuid, NULL, &virtualMachine, esxVI_Occurrence_OptionalItem) < 0) { goto cleanup; @@ -2592,8 +2529,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } /* Build VMX from domain XML */ - vmx = esxVMX_FormatConfig(priv->host, priv->caps, def, - priv->host->productVersion); + vmx = esxVMX_FormatConfig(priv->primary, priv->caps, def, + priv->primary->productVersion); if (vmx == NULL) { goto cleanup; @@ -2657,7 +2594,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) virBufferURIEncodeString(&buffer, def->name); virBufferAddLit(&buffer, ".vmx?dcPath="); - virBufferURIEncodeString(&buffer, priv->host->datacenter->value); + virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); @@ -2682,31 +2619,21 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } } - /* Get resource pool */ - if (esxVI_String_AppendValueToList(&propertyNameList, "parent") < 0 || - esxVI_LookupHostSystemByIp(priv->host, priv->host->ipAddress, - propertyNameList, &hostSystem) < 0) { - goto cleanup; - } - - if (esxVI_LookupResourcePoolByHostSystem(priv->host, hostSystem, - &resourcePool) < 0) { - goto cleanup; - } - /* Check, if VMX file already exists */ /* FIXME */ /* Upload VMX file */ - if (esxVI_Context_UploadFile(priv->host, url, vmx) < 0) { + if (esxVI_Context_UploadFile(priv->primary, url, vmx) < 0) { goto cleanup; } /* Register the domain */ - if (esxVI_RegisterVM_Task(priv->host, priv->host->vmFolder, + if (esxVI_RegisterVM_Task(priv->primary, priv->primary->datacenter->vmFolder, datastoreRelatedPath, NULL, esxVI_Boolean_False, - resourcePool, hostSystem->obj, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, def->uuid, + priv->primary->computeResource->resourcePool, + priv->primary->hostSystem->_reference, + &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, def->uuid, esxVI_Occurrence_OptionalItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; @@ -3102,32 +3029,25 @@ static int esxDomainMigratePrepare(virConnectPtr dconn, char **cookie ATTRIBUTE_UNUSED, int *cookielen ATTRIBUTE_UNUSED, - const char *uri_in, char **uri_out, + const char *uri_in ATTRIBUTE_UNUSED, + char **uri_out, unsigned long flags ATTRIBUTE_UNUSED, const char *dname ATTRIBUTE_UNUSED, unsigned long resource ATTRIBUTE_UNUSED) { - int result = -1; - esxUtil_ParsedUri *parsedUri = NULL; + esxPrivate *priv = dconn->privateData; if (uri_in == NULL) { - if (esxUtil_ParseUri(&parsedUri, dconn->uri) < 0) { - return -1; - } - - if (virAsprintf(uri_out, "%s://%s:%d/sdk", parsedUri->transport, - dconn->uri->server, dconn->uri->port) < 0) { + if (virAsprintf(uri_out, "vpxmigr://%s/%s/%s", + priv->vCenter->ipAddress, + priv->vCenter->computeResource->resourcePool->value, + priv->vCenter->hostSystem->_reference->value) < 0) { virReportOOMError(); - goto cleanup; + return -1; } } - result = 0; - - cleanup: - esxUtil_FreeParsedUri(&parsedUri); - - return result; + return 0; } @@ -3143,12 +3063,13 @@ esxDomainMigratePerform(virDomainPtr domain, { int result = -1; esxPrivate *priv = domain->conn->privateData; - xmlURIPtr xmlUri = NULL; - char hostIpAddress[NI_MAXHOST] = ""; + xmlURIPtr parsedUri = NULL; + char *saveptr; + char *path_resourcePool; + char *path_hostSystem; esxVI_ObjectContent *virtualMachine = NULL; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *hostSystem = NULL; - esxVI_ManagedObjectReference *resourcePool = NULL; + esxVI_ManagedObjectReference resourcePool; + esxVI_ManagedObjectReference hostSystem; esxVI_Event *eventList = NULL; esxVI_ManagedObjectReference *task = NULL; esxVI_TaskInfoState taskInfoState; @@ -3169,39 +3090,57 @@ esxDomainMigratePerform(virDomainPtr domain, return -1; } - /* Parse the destination URI and resolve the hostname */ - xmlUri = xmlParseURI(uri); + /* Parse migration URI */ + parsedUri = xmlParseURI(uri); - if (xmlUri == NULL) { + if (parsedUri == NULL) { virReportOOMError(); return -1; } - if (esxUtil_ResolveHostname(xmlUri->server, hostIpAddress, - NI_MAXHOST) < 0) { + if (parsedUri->scheme == NULL || STRCASENEQ(parsedUri->scheme, "vpxmigr")) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Only vpxmigr:// migration URIs are supported")); goto cleanup; } - /* Lookup VirtualMachine, HostSystem and ResourcePool */ - if (esxVI_LookupVirtualMachineByUuidAndPrepareForTask - (priv->vCenter, domain->uuid, NULL, &virtualMachine, - priv->autoAnswer) < 0 || - esxVI_String_AppendValueToList(&propertyNameList, "parent") < 0 || - esxVI_LookupHostSystemByIp(priv->vCenter, hostIpAddress, - propertyNameList, &hostSystem) < 0) { + if (STRCASENEQ(priv->vCenter->ipAddress, parsedUri->server)) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Migration source and destination have to refer to " + "the same vCenter")); + goto cleanup; + } + + path_resourcePool = strtok_r(parsedUri->path, "/", &saveptr); + path_hostSystem = strtok_r(NULL, "", &saveptr); + + if (path_resourcePool == NULL || path_hostSystem == NULL) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Migration URI has to specify resource pool and host system")); goto cleanup; } - if (esxVI_LookupResourcePoolByHostSystem(priv->vCenter, hostSystem, - &resourcePool) < 0) { + resourcePool._next = NULL; + resourcePool._type = esxVI_Type_ManagedObjectReference; + resourcePool.type = (char *)"ResourcePool"; + resourcePool.value = path_resourcePool; + + hostSystem._next = NULL; + hostSystem._type = esxVI_Type_ManagedObjectReference; + hostSystem.type = (char *)"HostSystem"; + hostSystem.value = path_hostSystem; + + /* Lookup VirtualMachine */ + if (esxVI_LookupVirtualMachineByUuidAndPrepareForTask + (priv->vCenter, domain->uuid, NULL, &virtualMachine, + priv->autoAnswer) < 0) { goto cleanup; } /* Validate the purposed migration */ if (esxVI_ValidateMigration(priv->vCenter, virtualMachine->obj, - esxVI_VirtualMachinePowerState_Undefined, - NULL, resourcePool, hostSystem->obj, - &eventList) < 0) { + esxVI_VirtualMachinePowerState_Undefined, NULL, + &resourcePool, &hostSystem, &eventList) < 0) { goto cleanup; } @@ -3224,8 +3163,8 @@ esxDomainMigratePerform(virDomainPtr domain, } /* Perform the purposed migration */ - if (esxVI_MigrateVM_Task(priv->vCenter, virtualMachine->obj, resourcePool, - hostSystem->obj, + if (esxVI_MigrateVM_Task(priv->vCenter, virtualMachine->obj, + &resourcePool, &hostSystem, esxVI_VirtualMachineMovePriority_DefaultPriority, esxVI_VirtualMachinePowerState_Undefined, &task) < 0 || @@ -3245,11 +3184,8 @@ esxDomainMigratePerform(virDomainPtr domain, result = 0; cleanup: - xmlFreeURI(xmlUri); + xmlFreeURI(parsedUri); esxVI_ObjectContent_Free(&virtualMachine); - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&hostSystem); - esxVI_ManagedObjectReference_Free(&resourcePool); esxVI_Event_Free(&eventList); esxVI_ManagedObjectReference_Free(&task); @@ -3276,41 +3212,19 @@ esxNodeGetFreeMemory(virConnectPtr conn) unsigned long long result = 0; esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *hostSystem = NULL; - esxVI_ManagedObjectReference *managedObjectReference = NULL; esxVI_ObjectContent *resourcePool = NULL; 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) { + if (esxVI_EnsureSession(priv->primary) < 0) { return 0; } - /* Lookup host system with its resource pool */ - if (esxVI_String_AppendValueToList(&propertyNameList, "parent") < 0 || - esxVI_LookupHostSystemByIp(priv->host, priv->host->ipAddress, - propertyNameList, &hostSystem) < 0) { - goto cleanup; - } - - if (esxVI_LookupResourcePoolByHostSystem(priv->host, hostSystem, - &managedObjectReference) < 0) { - goto cleanup; - } - - esxVI_String_Free(&propertyNameList); - /* Get memory usage of resource pool */ if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.memory") < 0 || - esxVI_LookupObjectContentByType(priv->host, managedObjectReference, + esxVI_LookupObjectContentByType(priv->primary, + priv->primary->computeResource->resourcePool, "ResourcePool", propertyNameList, esxVI_Boolean_False, &resourcePool) < 0) { @@ -3341,8 +3255,6 @@ esxNodeGetFreeMemory(virConnectPtr conn) cleanup: esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&hostSystem); - esxVI_ManagedObjectReference_Free(&managedObjectReference); esxVI_ObjectContent_Free(&resourcePool); esxVI_ResourcePoolResourceUsage_Free(&resourcePoolResourceUsage); diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 9f25e02..b0ccc32 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -78,9 +78,7 @@ esxNumberOfStoragePools(virConnectPtr conn) return -1; } - if (esxVI_LookupObjectContentByType(priv->primary, priv->primary->datacenter, - "Datastore", NULL, esxVI_Boolean_True, - &datastoreList) < 0) { + if (esxVI_LookupDatastoreList(priv->primary, NULL, &datastoreList) < 0) { return -1; } @@ -123,10 +121,8 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupObjectContentByType(priv->primary, priv->primary->datacenter, - "Datastore", propertyNameList, - esxVI_Boolean_True, - &datastoreList) < 0) { + esxVI_LookupDatastoreList(priv->primary, propertyNameList, + &datastoreList) < 0) { goto cleanup; } @@ -308,15 +304,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) char *name = NULL; virStoragePoolPtr pool = NULL; - /* 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; - } - - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -334,7 +322,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) * part of the 'summary.url' property if there is no name match. */ if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupDatastoreByName(priv->host, uuid_string, + esxVI_LookupDatastoreByName(priv->primary, uuid_string, propertyNameList, &datastore, esxVI_Occurrence_OptionalItem) < 0) { goto cleanup; @@ -350,7 +338,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (datastore == NULL && STREQ(uuid_string + 17, "-0000-000000000000")) { uuid_string[17] = '\0'; - if (esxVI_LookupDatastoreByName(priv->host, uuid_string, + if (esxVI_LookupDatastoreByName(priv->primary, uuid_string, propertyNameList, &datastore, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 5695881..9f2ac36 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -101,10 +101,11 @@ ESX_VI__TEMPLATE__FREE(Context, VIR_FREE(item->password); esxVI_ServiceContent_Free(&item->service); esxVI_UserSession_Free(&item->session); - esxVI_ManagedObjectReference_Free(&item->datacenter); - esxVI_ManagedObjectReference_Free(&item->vmFolder); - esxVI_ManagedObjectReference_Free(&item->hostFolder); + esxVI_Datacenter_Free(&item->datacenter); + esxVI_ComputeResource_Free(&item->computeResource); + esxVI_HostSystem_Free(&item->hostSystem); esxVI_SelectionSpec_Free(&item->fullTraversalSpecList); + esxVI_SelectionSpec_Free(&item->fullTraversalSpecList2); }); static size_t @@ -279,11 +280,6 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, const char *password, esxUtil_ParsedUri *parsedUri) { - int result = -1; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datacenterList = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - if (ctx == NULL || url == NULL || ipAddress == NULL || username == NULL || password == NULL || ctx->url != NULL || ctx->service != NULL || ctx->curl_handle != NULL || ctx->curl_headers != NULL) { @@ -293,7 +289,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (esxVI_String_DeepCopyValue(&ctx->url, url) < 0 || esxVI_String_DeepCopyValue(&ctx->ipAddress, ipAddress) < 0) { - goto cleanup; + return -1; } ctx->curl_handle = curl_easy_init(); @@ -301,7 +297,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->curl_handle == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize CURL")); - goto cleanup; + return -1; } ctx->curl_headers = curl_slist_append(ctx->curl_headers, "Content-Type: " @@ -321,7 +317,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->curl_headers == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not build CURL header list")); - goto cleanup; + return -1; } curl_easy_setopt(ctx->curl_handle, CURLOPT_URL, ctx->url); @@ -357,7 +353,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (virMutexInit(&ctx->curl_lock) < 0) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize CURL mutex")); - goto cleanup; + return -1; } ctx->username = strdup(username); @@ -365,11 +361,11 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->username == NULL || ctx->password == NULL) { virReportOOMError(); - goto cleanup; + return -1; } if (esxVI_RetrieveServiceContent(ctx, &ctx->service) < 0) { - goto cleanup; + return -1; } if (STREQ(ctx->service->about->apiType, "HostAgent") || @@ -389,7 +385,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VI API major/minor version '2.5' or '4.x' " "but found '%s'"), ctx->service->about->apiVersion); - goto cleanup; + return -1; } if (STREQ(ctx->service->about->productLineId, "gsx")) { @@ -399,7 +395,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting GSX major/minor version '2.0' but " "found '%s'"), ctx->service->about->version); - goto cleanup; + return -1; } } else if (STREQ(ctx->service->about->productLineId, "esx") || STREQ(ctx->service->about->productLineId, "embeddedEsx")) { @@ -419,7 +415,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Expecting ESX major/minor version '3.5' or " "'4.x' but found '%s'"), ctx->service->about->version); - goto cleanup; + return -1; } } else if (STREQ(ctx->service->about->productLineId, "vpx")) { if (STRPREFIX(ctx->service->about->version, "2.5")) { @@ -437,36 +433,67 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VPX major/minor version '2.5' or '4.x' " "but found '%s'"), ctx->service->about->version); - goto cleanup; + return -1; } } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " "or 'vpx' but found '%s'"), ctx->service->about->productLineId); - goto cleanup; + return -1; } } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " "but found '%s'"), ctx->service->about->apiType); - goto cleanup; + return -1; } - if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0) { - goto cleanup; + if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || + esxVI_BuildFullTraversalSpecList(&ctx->fullTraversalSpecList) < 0) { + return -1; } - esxVI_BuildFullTraversalSpecList(&ctx->fullTraversalSpecList); + /* Folder -> parent (Folder, Datacenter) */ + if (esxVI_BuildFullTraversalSpecItem(&ctx->fullTraversalSpecList2, + "managedEntityToParent", + "ManagedEntity", "parent", + NULL) < 0) { + return -1; + } - if (esxVI_String_AppendValueListToList(&propertyNameList, - "vmFolder\0" - "hostFolder\0") < 0) { - goto cleanup; + /* ComputeResource -> parent (Folder) */ + if (esxVI_BuildFullTraversalSpecItem(&ctx->fullTraversalSpecList2, + "computeResourceToParent", + "ComputeResource", "parent", + "managedEntityToParent\0") < 0) { + return -1; } - /* Get pointer to Datacenter for later use */ - if (esxVI_LookupObjectContentByType(ctx, ctx->service->rootFolder, + return 0; +} + +int +esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, + esxUtil_ParsedUri *parsedUri) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + char *name = NULL; + esxVI_ObjectContent *datacenterList = NULL; + esxVI_ObjectContent *datacenter = NULL; + esxVI_ObjectContent *computeResourceList = NULL; + esxVI_ObjectContent *computeResource = NULL; + char *hostSystemName = NULL; + esxVI_ObjectContent *hostSystemList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + + /* Lookup Datacenter */ + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0" + "vmFolder\0" + "hostFolder\0") < 0 || + esxVI_LookupObjectContentByType(ctx, ctx->service->rootFolder, "Datacenter", propertyNameList, esxVI_Boolean_True, &datacenterList) < 0) { @@ -475,36 +502,156 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (datacenterList == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve the 'datacenter' object from the " - "VI host/center")); + _("Could not retrieve datacenter list")); goto cleanup; } - ctx->datacenter = datacenterList->obj; - datacenterList->obj = NULL; + if (parsedUri->path_datacenter != NULL) { + for (datacenter = datacenterList; datacenter != NULL; + datacenter = datacenter->_next) { + name = NULL; - /* Get pointer to vmFolder and hostFolder for later use */ - for (dynamicProperty = datacenterList->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "vmFolder")) { - if (esxVI_ManagedObjectReference_CastFromAnyType - (dynamicProperty->val, &ctx->vmFolder)) { + if (esxVI_GetStringValue(datacenter, "name", &name, + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - } else if (STREQ(dynamicProperty->name, "hostFolder")) { - if (esxVI_ManagedObjectReference_CastFromAnyType - (dynamicProperty->val, &ctx->hostFolder)) { + + if (STREQ(name, parsedUri->path_datacenter)) { + break; + } + } + + if (datacenter == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find datacenter '%s'"), + parsedUri->path_datacenter); + goto cleanup; + } + } else { + datacenter = datacenterList; + } + + if (esxVI_Datacenter_CastFromObjectContent(datacenter, + &ctx->datacenter) < 0) { + goto cleanup; + } + + /* Lookup ComputeResource */ + esxVI_String_Free(&propertyNameList); + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0" + "host\0" + "resourcePool\0") < 0 || + esxVI_LookupObjectContentByType(ctx, ctx->datacenter->hostFolder, + "ComputeResource", propertyNameList, + esxVI_Boolean_True, + &computeResourceList) < 0) { + goto cleanup; + } + + if (computeResourceList == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve compute resource list")); + goto cleanup; + } + + if (parsedUri->path_computeResource != NULL) { + for (computeResource = computeResourceList; computeResource != NULL; + computeResource = computeResource->_next) { + name = NULL; + + if (esxVI_GetStringValue(computeResource, "name", &name, + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + + if (STREQ(name, parsedUri->path_computeResource)) { + break; + } } + + if (computeResource == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find compute resource '%s'"), + parsedUri->path_computeResource); + goto cleanup; + } + } else { + computeResource = computeResourceList; + } + + if (esxVI_ComputeResource_CastFromObjectContent(computeResource, + &ctx->computeResource) < 0) { + goto cleanup; + } + + if (ctx->computeResource->resourcePool == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve resource pool")); + goto cleanup; + } + + /* Lookup HostSystem */ + if (parsedUri->path_hostSystem == NULL && + STREQ(ctx->computeResource->_reference->type, + "ClusterComputeResource")) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Path has to specify the host system")); + goto cleanup; } - if (ctx->vmFolder == NULL || ctx->hostFolder == NULL) { + esxVI_String_Free(&propertyNameList); + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0") < 0 || + esxVI_LookupObjectContentByType(ctx, ctx->computeResource->_reference, + "HostSystem", propertyNameList, + esxVI_Boolean_True, + &hostSystemList) < 0) { + goto cleanup; + } + + if (hostSystemList == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("The 'datacenter' object is missing the " - "'vmFolder'/'hostFolder' property")); + _("Could not retrieve host system list")); + goto cleanup; + } + + if (parsedUri->path_hostSystem != NULL || + (parsedUri->path_computeResource != NULL && + parsedUri->path_hostSystem == NULL)) { + if (parsedUri->path_hostSystem != NULL) { + hostSystemName = parsedUri->path_hostSystem; + } else { + hostSystemName = parsedUri->path_computeResource; + } + + for (hostSystem = hostSystemList; hostSystem != NULL; + hostSystem = hostSystem->_next) { + name = NULL; + + if (esxVI_GetStringValue(hostSystem, "name", &name, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + if (STREQ(name, hostSystemName)) { + break; + } + } + + if (hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find host system '%s'"), hostSystemName); + goto cleanup; + } + } else { + hostSystem = hostSystemList; + } + + if (esxVI_HostSystem_CastFromObjectContent(hostSystem, + &ctx->hostSystem) < 0) { goto cleanup; } @@ -513,6 +660,110 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datacenterList); + esxVI_ObjectContent_Free(&computeResourceList); + esxVI_ObjectContent_Free(&hostSystemList); + + return result; +} + +int +esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, + const char *hostSystemIpAddress) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_ManagedObjectReference *managedObjectReference = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_ObjectContent *computeResource = NULL; + esxVI_ObjectContent *datacenter = NULL; + + /* Lookup HostSystem */ + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0") < 0 || + esxVI_FindByIp(ctx, NULL, hostSystemIpAddress, esxVI_Boolean_False, + &managedObjectReference) < 0 || + esxVI_LookupObjectContentByType(ctx, managedObjectReference, + "HostSystem", propertyNameList, + esxVI_Boolean_False, &hostSystem) < 0) { + goto cleanup; + } + + if (hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve host system")); + goto cleanup; + } + + if (esxVI_HostSystem_CastFromObjectContent(hostSystem, + &ctx->hostSystem) < 0) { + goto cleanup; + } + + /* Lookup ComputeResource */ + esxVI_String_Free(&propertyNameList); + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0" + "host\0" + "resourcePool\0") < 0 || + esxVI_LookupObjectContentByType(ctx, hostSystem->obj, + "ComputeResource", propertyNameList, + esxVI_Boolean_True, + &computeResource) < 0) { + goto cleanup; + } + + if (computeResource == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve compute resource of host system")); + goto cleanup; + } + + if (esxVI_ComputeResource_CastFromObjectContent(computeResource, + &ctx->computeResource) < 0) { + goto cleanup; + } + + /* Lookup Datacenter */ + esxVI_String_Free(&propertyNameList); + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0" + "vmFolder\0" + "hostFolder\0") < 0 || + esxVI_LookupObjectContentByType(ctx, computeResource->obj, + "Datacenter", propertyNameList, + /* FIXME: Passing Undefined here is a hack until + * esxVI_LookupObjectContentByType supports more + * fine grained traversal configuration. Looking + * up the Datacenter from the ComputeResource + * requiers an upward search. Putting this in the + * list with the other downward traversal rules + * would result in cyclic searching */ + esxVI_Boolean_Undefined, + &datacenter) < 0) { + goto cleanup; + } + + if (datacenter == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve datacenter of compute resource")); + goto cleanup; + } + + if (esxVI_Datacenter_CastFromObjectContent(datacenter, + &ctx->datacenter) < 0) { + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ManagedObjectReference_Free(&managedObjectReference); + esxVI_ObjectContent_Free(&hostSystem); + esxVI_ObjectContent_Free(&computeResource); + esxVI_ObjectContent_Free(&datacenter); return result; } @@ -1219,82 +1470,64 @@ esxVI_BuildFullTraversalSpecList(esxVI_SelectionSpec **fullTraversalSpecList) return -1; } + /* Folder -> childEntity (ManagedEntity) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "visitFolders", + "folderToChildEntity", "Folder", "childEntity", - "visitFolders\0" - "datacenterToDatastore\0" - "datacenterToVmFolder\0" - "datacenterToHostFolder\0" - "computeResourceToHost\0" - "computeResourceToResourcePool\0" - "hostSystemToVm\0" - "resourcePoolToVm\0") < 0) { + "folderToChildEntity\0") < 0) { goto failure; } - /* Traversal through datastore branch */ + /* ComputeResource -> host (HostSystem) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "datacenterToDatastore", - "Datacenter", "datastore", + "computeResourceToHost", + "ComputeResource", "host", NULL) < 0) { goto failure; } - /* Traversal through vmFolder branch */ - if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "datacenterToVmFolder", - "Datacenter", "vmFolder", - "visitFolders\0") < 0) { - goto failure; - } - - /* Traversal through hostFolder branch */ + /* ComputeResource -> datastore (Datastore) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "datacenterToHostFolder", - "Datacenter", "hostFolder", - "visitFolders\0") < 0) { + "computeResourceToDatastore", + "ComputeResource", "datastore", + NULL) < 0) { goto failure; } - /* Traversal through host branch */ + /* ResourcePool -> resourcePool (ResourcePool) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "computeResourceToHost", - "ComputeResource", "host", - NULL) < 0) { + "resourcePoolToResourcePool", + "ResourcePool", "resourcePool", + "resourcePoolToResourcePool\0" + "resourcePoolToVm\0") < 0) { goto failure; } - /* Traversal through resourcePool branch */ + /* ResourcePool -> vm (VirtualMachine) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "computeResourceToResourcePool", - "ComputeResource", "resourcePool", - "resourcePoolToResourcePool\0" - "resourcePoolToVm\0") < 0) { + "resourcePoolToVm", + "ResourcePool", "vm", NULL) < 0) { goto failure; } - /* Recurse through all resource pools */ + /* HostSystem -> parent (ComputeResource) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "resourcePoolToResourcePool", - "ResourcePool", "resourcePool", - "resourcePoolToResourcePool\0" - "resourcePoolToVm\0") < 0) { + "hostSystemToParent", + "HostSystem", "parent", NULL) < 0) { goto failure; } - /* Recurse through all hosts */ + /* HostSystem -> vm (VirtualMachine) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, "hostSystemToVm", - "HostSystem", "vm", - "visitFolders\0") < 0) { + "HostSystem", "vm", NULL) < 0) { goto failure; } - /* Recurse through all resource pools */ + /* HostSystem -> datastore (Datastore) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "resourcePoolToVm", - "ResourcePool", "vm", NULL) < 0) { + "hostSystemToDatastore", + "HostSystem", "datastore", NULL) < 0) { goto failure; } @@ -1422,6 +1655,11 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, return -1; } + if (objectContentList == NULL || *objectContentList != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + if (esxVI_ObjectSpec_Alloc(&objectSpec) < 0) { return -1; } @@ -1431,6 +1669,8 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, if (recurse == esxVI_Boolean_True) { objectSpec->selectSet = ctx->fullTraversalSpecList; + } else if (recurse == esxVI_Boolean_Undefined) { + objectSpec->selectSet = ctx->fullTraversalSpecList2; } if (esxVI_PropertySpec_Alloc(&propertySpec) < 0) { @@ -1669,9 +1909,8 @@ esxVI_LookupNumberOfDomainsByPowerState(esxVI_Context *ctx, if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || - esxVI_LookupObjectContentByType(ctx, ctx->vmFolder, "VirtualMachine", - propertyNameList, esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineList(ctx, propertyNameList, + &virtualMachineList) < 0) { goto cleanup; } @@ -1965,125 +2204,28 @@ esxVI_GetSnapshotTreeBySnapshot -int -esxVI_LookupResourcePoolByHostSystem - (esxVI_Context *ctx, esxVI_ObjectContent *hostSystem, - esxVI_ManagedObjectReference **resourcePool) +int esxVI_LookupHostSystemProperties(esxVI_Context *ctx, + esxVI_String *propertyNameList, + esxVI_ObjectContent **hostSystem) { - int result = -1; - esxVI_String *propertyNameList = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_ManagedObjectReference *managedObjectReference = NULL; - esxVI_ObjectContent *computeResource = NULL; - - if (resourcePool == NULL || *resourcePool != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; - } - - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "parent")) { - if (esxVI_ManagedObjectReference_CastFromAnyType - (dynamicProperty->val, &managedObjectReference) < 0) { - goto cleanup; - } - - break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); - } - } - - if (managedObjectReference == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve compute resource of host system")); - goto cleanup; - } - - if (esxVI_String_AppendValueToList(&propertyNameList, "resourcePool") < 0 || - esxVI_LookupObjectContentByType(ctx, managedObjectReference, - "ComputeResource", propertyNameList, - esxVI_Boolean_False, - &computeResource) < 0) { - goto cleanup; - } - - if (computeResource == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve compute resource of host system")); - goto cleanup; - } - - for (dynamicProperty = computeResource->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "resourcePool")) { - if (esxVI_ManagedObjectReference_CastFromAnyType - (dynamicProperty->val, resourcePool) < 0) { - goto cleanup; - } - - break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); - } - } - - if ((*resourcePool) == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve resource pool of compute resource")); - goto cleanup; - } - - result = 0; - - cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ManagedObjectReference_Free(&managedObjectReference); - esxVI_ObjectContent_Free(&computeResource); - - return result; + return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, + "HostSystem", propertyNameList, + esxVI_Boolean_False, hostSystem); } int -esxVI_LookupHostSystemByIp(esxVI_Context *ctx, const char *ipAddress, - esxVI_String *propertyNameList, - esxVI_ObjectContent **hostSystem) +esxVI_LookupVirtualMachineList(esxVI_Context *ctx, + esxVI_String *propertyNameList, + esxVI_ObjectContent **virtualMachineList) { - int result = -1; - esxVI_ManagedObjectReference *managedObjectReference = NULL; - - if (hostSystem == NULL || *hostSystem != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; - } - - if (esxVI_FindByIp(ctx, ctx->datacenter, ipAddress, esxVI_Boolean_False, - &managedObjectReference) < 0) { - return -1; - } - - if (managedObjectReference == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not find host system with IP address '%s'"), - ipAddress); - goto cleanup; - } - - if (esxVI_LookupObjectContentByType(ctx, managedObjectReference, - "HostSystem", propertyNameList, - esxVI_Boolean_False, hostSystem) < 0) { - goto cleanup; - } - - result = 0; - - cleanup: - esxVI_ManagedObjectReference_Free(&managedObjectReference); - - return result; + /* FIXME: Switch from ctx->hostSystem to ctx->computeResource->resourcePool + * for cluster support */ + return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + virtualMachineList); } @@ -2105,8 +2247,8 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid, virUUIDFormat(uuid, uuid_string); - if (esxVI_FindByUuid(ctx, ctx->datacenter, uuid_string, esxVI_Boolean_True, - &managedObjectReference) < 0) { + if (esxVI_FindByUuid(ctx, ctx->datacenter->_reference, uuid_string, + esxVI_Boolean_True, &managedObjectReference) < 0) { return -1; } @@ -2158,10 +2300,8 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name, if (esxVI_String_DeepCopyList(&completePropertyNameList, propertyNameList) < 0 || esxVI_String_AppendValueToList(&completePropertyNameList, "name") < 0 || - esxVI_LookupObjectContentByType(ctx, ctx->vmFolder, "VirtualMachine", - completePropertyNameList, - esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineList(ctx, completePropertyNameList, + &virtualMachineList) < 0) { goto cleanup; } @@ -2260,6 +2400,19 @@ esxVI_LookupVirtualMachineByUuidAndPrepareForTask int +esxVI_LookupDatastoreList(esxVI_Context *ctx, esxVI_String *propertyNameList, + esxVI_ObjectContent **datastoreList) +{ + /* FIXME: Switch from ctx->hostSystem to ctx->computeResource for cluster + * support */ + return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, + "Datastore", propertyNameList, + esxVI_Boolean_True, datastoreList); +} + + + +int esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_String *propertyNameList, esxVI_ObjectContent **datastore, @@ -2285,14 +2438,9 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_String_AppendValueListToList(&completePropertyNameList, "summary.accessible\0" "summary.name\0" - "summary.url\0") < 0) { - goto cleanup; - } - - if (esxVI_LookupObjectContentByType(ctx, ctx->datacenter, "Datastore", - completePropertyNameList, - esxVI_Boolean_True, - &datastoreList) < 0) { + "summary.url\0") < 0 || + esxVI_LookupDatastoreList(ctx, completePropertyNameList, + &datastoreList) < 0) { goto cleanup; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 325ba69..a23c56d 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -158,10 +158,11 @@ struct _esxVI_Context { esxVI_APIVersion apiVersion; esxVI_ProductVersion productVersion; esxVI_UserSession *session; - esxVI_ManagedObjectReference *datacenter; - esxVI_ManagedObjectReference *vmFolder; - esxVI_ManagedObjectReference *hostFolder; + esxVI_Datacenter *datacenter; + esxVI_ComputeResource *computeResource; + esxVI_HostSystem *hostSystem; esxVI_SelectionSpec *fullTraversalSpecList; + esxVI_SelectionSpec *fullTraversalSpecList2; }; int esxVI_Context_Alloc(esxVI_Context **ctx); @@ -169,6 +170,10 @@ void esxVI_Context_Free(esxVI_Context **ctx); int esxVI_Context_Connect(esxVI_Context *ctx, const char *ipAddress, const char *url, const char *username, const char *password, esxUtil_ParsedUri *parsedUri); +int esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, + esxUtil_ParsedUri *parsedUri); +int esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, + const char *hostSystemIpAddress); int esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url, char **content); int esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url, @@ -327,13 +332,13 @@ int esxVI_GetSnapshotTreeBySnapshot esxVI_ManagedObjectReference *snapshot, esxVI_VirtualMachineSnapshotTree **snapshotTree); -int esxVI_LookupResourcePoolByHostSystem - (esxVI_Context *ctx, esxVI_ObjectContent *hostSystem, - esxVI_ManagedObjectReference **resourcePool); +int esxVI_LookupHostSystemProperties(esxVI_Context *ctx, + esxVI_String *propertyNameList, + esxVI_ObjectContent **hostSystem); -int esxVI_LookupHostSystemByIp(esxVI_Context *ctx, const char *ipAddress, - esxVI_String *propertyNameList, - esxVI_ObjectContent **hostSystem); +int esxVI_LookupVirtualMachineList(esxVI_Context *ctx, + esxVI_String *propertyNameList, + esxVI_ObjectContent **virtualMachineList); int esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid, @@ -351,6 +356,9 @@ int esxVI_LookupVirtualMachineByUuidAndPrepareForTask esxVI_String *propertyNameList, esxVI_ObjectContent **virtualMachine, esxVI_Boolean autoAnswer); +int esxVI_LookupDatastoreList(esxVI_Context *ctx, esxVI_String *propertyNameList, + esxVI_ObjectContent **datastoreList); + int esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_String *propertyNameList, esxVI_ObjectContent **datastore, diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 8905ffd..807c6db 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -2711,6 +2711,10 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def, case esxVI_ProductVersion_ESX40: case esxVI_ProductVersion_ESX41: case esxVI_ProductVersion_ESX4x: + /* FIXME: Putting VPX* here is a hack until a more fine grained system is in place */ + case esxVI_ProductVersion_VPX40: + case esxVI_ProductVersion_VPX41: + case esxVI_ProductVersion_VPX4x: virBufferAddLit(&buffer, "virtualHW.version = \"7\"\n"); break; -- 1.7.0.4

2 4

[libvirt] [PATCH] esx: Set storage pool target path to host.mountInfo.path
by Matthias Bolte 02 Aug '10

02 Aug '10

Now all storage pool types expose the target path. --- src/esx/esx_storage_driver.c | 114 ++++++++++++++++++----------------------- src/esx/esx_vi.c | 68 +++++++++++++++++++++++++ src/esx/esx_vi.h | 4 ++ src/esx/esx_vi_generator.py | 2 +- 4 files changed, 123 insertions(+), 65 deletions(-) diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index e0680a1..4fcc4af 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -194,11 +194,8 @@ static virStoragePoolPtr esxStoragePoolLookupByName(virConnectPtr conn, const char *name) { esxPrivate *priv = conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *datastore = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_DatastoreHostMount *datastoreHostMountList = NULL; - esxVI_DatastoreHostMount *datastoreHostMount = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; char *suffix = NULL; int suffixLength; char uuid_string[VIR_UUID_STRING_BUFLEN] = "00000000-00000000-0000-000000000000"; @@ -209,9 +206,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) return NULL; } - if (esxVI_String_AppendValueToList(&propertyNameList, "host") < 0 || - esxVI_LookupDatastoreByName(priv->primary, name, - propertyNameList, &datastore, + if (esxVI_LookupDatastoreByName(priv->primary, name, NULL, &datastore, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } @@ -232,30 +227,12 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) * The object name of virtual machine contains an integer, we use that as * domain ID. */ - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "host")) { - if (esxVI_DatastoreHostMount_CastListFromAnyType - (dynamicProperty->val, &datastoreHostMountList) < 0) { - goto cleanup; - } - - break; - } + if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount) < 0) { + goto cleanup; } - for (datastoreHostMount = datastoreHostMountList; datastoreHostMount != NULL; - datastoreHostMount = datastoreHostMount->_next) { - if (STRNEQ(priv->primary->hostSystem->_reference->value, - datastoreHostMount->key->value)) { - continue; - } - - if ((suffix = STRSKIP(datastoreHostMount->mountInfo->path, - "/vmfs/volumes/")) == NULL) { - break; - } - + if ((suffix = STRSKIP(hostMount->mountInfo->path, "/vmfs/volumes/")) != NULL) { suffixLength = strlen(suffix); if ((suffixLength == 35 && /* = strlen("4b0beca7-7fd401f3-1d7f-000ae484a6a3") */ @@ -284,9 +261,8 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) pool = virGetStoragePool(conn, name, uuid); cleanup: - esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); - esxVI_DatastoreHostMount_Free(&datastoreHostMountList); + esxVI_DatastoreHostMount_Free(&hostMount); return pool; } @@ -481,13 +457,12 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) esxPrivate *priv = pool->conn->storagePrivateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *datastore = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_Boolean accessible = esxVI_Boolean_Undefined; virStoragePoolDef def; esxVI_DatastoreInfo *info = NULL; - esxVI_LocalDatastoreInfo *localInfo = NULL; esxVI_NasDatastoreInfo *nasInfo = NULL; - esxVI_VmfsDatastoreInfo *vmfsInfo = NULL; char *xml = NULL; virCheckFlags(0, NULL); @@ -507,13 +482,17 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) propertyNameList, &datastore, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetBoolean(datastore, "summary.accessible", - &accessible, esxVI_Occurrence_RequiredItem) < 0) { + &accessible, esxVI_Occurrence_RequiredItem) < 0 || + esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount) < 0) { goto cleanup; } def.name = pool->name; memcpy(def.uuid, pool->uuid, VIR_UUID_BUFLEN); + def.target.path = hostMount->mountInfo->path; + if (accessible == esxVI_Boolean_True) { for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { @@ -531,46 +510,52 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) } def.available = dynamicProperty->val->int64; - } else if (STREQ(dynamicProperty->name, "info")) { - if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, - &info) < 0) { - goto cleanup; - } } } def.allocation = def.capacity - def.available; + } - /* See vSphere API documentation about HostDatastoreSystem for details */ - if ((localInfo = esxVI_LocalDatastoreInfo_DynamicCast(info)) != NULL) { - def.type = VIR_STORAGE_POOL_DIR; - def.target.path = localInfo->path; - } else if ((nasInfo = esxVI_NasDatastoreInfo_DynamicCast(info)) != NULL) { - def.type = VIR_STORAGE_POOL_NETFS; - def.source.host.name = nasInfo->nas->remoteHost; - def.source.dir = nasInfo->nas->remotePath; - - if (STRCASEEQ(nasInfo->nas->type, "NFS")) { - def.source.format = VIR_STORAGE_POOL_NETFS_NFS; - } else if (STRCASEEQ(nasInfo->nas->type, "CIFS")) { - def.source.format = VIR_STORAGE_POOL_NETFS_CIFS; - } else { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Datastore has unexpected type '%s'"), - nasInfo->nas->type); + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "info")) { + if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, + &info) < 0) { goto cleanup; } - } else if ((vmfsInfo = esxVI_VmfsDatastoreInfo_DynamicCast(info)) != NULL) { - def.type = VIR_STORAGE_POOL_FS; - /* - * FIXME: I'm not sure how to represent the source and target of a - * VMFS based datastore in libvirt terms - */ + + break; + } + } + + /* See vSphere API documentation about HostDatastoreSystem for details */ + if (esxVI_LocalDatastoreInfo_DynamicCast(info) != NULL) { + def.type = VIR_STORAGE_POOL_DIR; + } else if ((nasInfo = esxVI_NasDatastoreInfo_DynamicCast(info)) != NULL) { + def.type = VIR_STORAGE_POOL_NETFS; + def.source.host.name = nasInfo->nas->remoteHost; + def.source.dir = nasInfo->nas->remotePath; + + if (STRCASEEQ(nasInfo->nas->type, "NFS")) { + def.source.format = VIR_STORAGE_POOL_NETFS_NFS; + } else if (STRCASEEQ(nasInfo->nas->type, "CIFS")) { + def.source.format = VIR_STORAGE_POOL_NETFS_CIFS; } else { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("DatastoreInfo has unexpected type")); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Datastore has unexpected type '%s'"), + nasInfo->nas->type); goto cleanup; } + } else if (esxVI_VmfsDatastoreInfo_DynamicCast(info) != NULL) { + def.type = VIR_STORAGE_POOL_FS; + /* + * FIXME: I'm not sure how to represent the source and target of a + * VMFS based datastore in libvirt terms + */ + } else { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("DatastoreInfo has unexpected type")); + goto cleanup; } xml = virStoragePoolDefFormat(&def); @@ -578,6 +563,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreHostMount_Free(&hostMount); esxVI_DatastoreInfo_Free(&info); return xml; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index f421502..55c5246 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2566,6 +2566,74 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, int +esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, + esxVI_ManagedObjectReference *datastore, + esxVI_DatastoreHostMount **hostMount) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *objectContent = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_DatastoreHostMount *hostMountList = NULL; + esxVI_DatastoreHostMount *candidate = NULL; + + if (hostMount == NULL || *hostMount != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_String_AppendValueToList(&propertyNameList, "host") < 0 || + esxVI_LookupObjectContentByType(ctx, datastore, "Datastore", + propertyNameList, esxVI_Boolean_False, + &objectContent) < 0) { + goto cleanup; + } + + for (dynamicProperty = objectContent->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "host")) { + if (esxVI_DatastoreHostMount_CastListFromAnyType + (dynamicProperty->val, &hostMountList) < 0) { + goto cleanup; + } + + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + for (candidate = hostMountList; candidate != NULL; + candidate = candidate->_next) { + if (STRNEQ(ctx->hostSystem->_reference->value, candidate->key->value)) { + continue; + } + + if (esxVI_DatastoreHostMount_DeepCopy(hostMount, candidate) < 0) { + goto cleanup; + } + + break; + } + + if (*hostMount == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not lookup datastore host mount")); + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&objectContent); + esxVI_DatastoreHostMount_Free(&hostMountList); + + return result; +} + + +int esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, esxVI_ManagedObjectReference *task, esxVI_TaskInfo **taskInfo) diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index fdd15f1..d5dc9d5 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -370,6 +370,10 @@ int esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, esxVI_ObjectContent **datastore, esxVI_Occurrence occurrence); +int esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, + esxVI_ManagedObjectReference *datastore, + esxVI_DatastoreHostMount **hostMount); + int esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, esxVI_ManagedObjectReference *task, esxVI_TaskInfo **taskInfo); diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index e3c3d14..411fd80 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1127,7 +1127,7 @@ additional_enum_features = { "ManagedEntityStatus" : Enum.FEATURE__ANY_TYPE "VirtualMachinePowerState" : Enum.FEATURE__ANY_TYPE } -additional_object_features = { "DatastoreHostMount" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, +additional_object_features = { "DatastoreHostMount" : Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, "DatastoreInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST, "Event" : Object.FEATURE__LIST, "FileInfo" : Object.FEATURE__DYNAMIC_CAST, -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Make storage pool lookup by name and UUID more robust
by Matthias Bolte 02 Aug '10

02 Aug '10

Don't rely on summary.url anymore, because its value is different between an esx:// and vpx:// connection. Use host.mountInfo.path instead. Don't fallback to lookup by UUID (actually lookup by absolute path) in esxVI_LookupDatastoreByName when lookup by name fails. Add a seperate function for this: esxVI_LookupDatastoreByAbsolutePath --- src/esx/esx_driver.c | 8 +- src/esx/esx_storage_driver.c | 107 ++++++++++++++------------ src/esx/esx_util.c | 22 +++--- src/esx/esx_util.h | 5 +- src/esx/esx_vi.c | 171 ++++++++++++++++++++-------------------- src/esx/esx_vi.h | 6 ++ src/esx/esx_vi_generator.input | 13 +++ src/esx/esx_vi_generator.py | 3 +- src/esx/esx_vmx.c | 65 +++++++-------- src/esx/esx_vmx.h | 3 +- tests/esxutilstest.c | 14 ++-- 11 files changed, 221 insertions(+), 196 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index fd87078..d824371 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2193,8 +2193,8 @@ esxDomainDumpXML(virDomainPtr domain, int flags) goto cleanup; } - if (esxUtil_ParseDatastoreRelatedPath(vmPathName, &datastoreName, - &directoryName, &fileName) < 0) { + if (esxUtil_ParseDatastorePath(vmPathName, &datastoreName, &directoryName, + &fileName) < 0) { goto cleanup; } @@ -2572,8 +2572,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) goto cleanup; } - if (esxUtil_ParseDatastoreRelatedPath(disk->src, &datastoreName, - &directoryName, &fileName) < 0) { + if (esxUtil_ParseDatastorePath(disk->src, &datastoreName, &directoryName, + &fileName) < 0) { goto cleanup; } diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index b0ccc32..e0680a1 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -196,61 +196,64 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) esxPrivate *priv = conn->storagePrivateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *datastore = NULL; - esxVI_Boolean accessible = esxVI_Boolean_Undefined; - char *summaryUrl = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_DatastoreHostMount *datastoreHostMountList = NULL; + esxVI_DatastoreHostMount *datastoreHostMount = NULL; char *suffix = NULL; int suffixLength; char uuid_string[VIR_UUID_STRING_BUFLEN] = "00000000-00000000-0000-000000000000"; unsigned char uuid[VIR_UUID_BUFLEN]; - char *realName = NULL; virStoragePoolPtr pool = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } - if (esxVI_String_AppendValueListToList(&propertyNameList, - "summary.accessible\0" - "summary.name\0" - "summary.url\0") < 0 || + if (esxVI_String_AppendValueToList(&propertyNameList, "host") < 0 || esxVI_LookupDatastoreByName(priv->primary, name, propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_GetBoolean(datastore, "summary.accessible", - &accessible, esxVI_Occurrence_RequiredItem) < 0) { + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } /* - * Datastores don't have a UUID. We can use the 'summary.url' property as - * source for a "UUID" on ESX, because the property value has this format: + * Datastores don't have a UUID. We can use the 'host.mountInfo.path' + * property as source for a "UUID" on ESX, because the property value has + * this format: * - * summary.url = /vmfs/volumes/4b0beca7-7fd401f3-1d7f-000ae484a6a3 - * summary.url = /vmfs/volumes/b24b7a78-9d82b4f5 (short format) + * host.mountInfo.path = /vmfs/volumes/4b0beca7-7fd401f3-1d7f-000ae484a6a3 + * host.mountInfo.path = /vmfs/volumes/b24b7a78-9d82b4f5 (short format) * - * The 'summary.url' property comes in two forms, with a complete "UUID" - * and a short "UUID". + * The 'host.mountInfo.path' property comes in two forms, with a complete + * "UUID" and a short "UUID". * * But this trailing "UUID" is not guaranteed to be there. On the other * hand we already rely on another implementation detail of the ESX server: * The object name of virtual machine contains an integer, we use that as * domain ID. - * - * The 'summary.url' property of an inaccessible datastore is invalid. */ - /* 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) { - goto cleanup; + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "host")) { + if (esxVI_DatastoreHostMount_CastListFromAnyType + (dynamicProperty->val, &datastoreHostMountList) < 0) { + goto cleanup; + } + + break; } + } - if ((suffix = STRSKIP(summaryUrl, "/vmfs/volumes/")) == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Datastore URL '%s' has unexpected prefix, " - "expecting '/vmfs/volumes/' prefix"), summaryUrl); - goto cleanup; + for (datastoreHostMount = datastoreHostMountList; datastoreHostMount != NULL; + datastoreHostMount = datastoreHostMount->_next) { + if (STRNEQ(priv->primary->hostSystem->_reference->value, + datastoreHostMount->key->value)) { + continue; + } + + if ((suffix = STRSKIP(datastoreHostMount->mountInfo->path, + "/vmfs/volumes/")) == NULL) { + break; } suffixLength = strlen(suffix); @@ -266,8 +269,8 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) */ memcpy(uuid_string, suffix, suffixLength); } else { - VIR_WARN("Datastore URL suffix '%s' has unexpected format, " - "cannot deduce a UUID from it", suffix); + VIR_WARN("Datastore host mount path suffix '%s' has unexpected " + "format, cannot deduce a UUID from it", suffix); } } @@ -278,16 +281,12 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) goto cleanup; } - if (esxVI_GetStringValue(datastore, "summary.name", &realName, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } - - pool = virGetStoragePool(conn, realName, uuid); + pool = virGetStoragePool(conn, name, uuid); cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreHostMount_Free(&datastoreHostMountList); return pool; } @@ -301,6 +300,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *datastore = NULL; char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; + char *absolutePath = NULL; char *name = NULL; virStoragePoolPtr pool = NULL; @@ -309,7 +309,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) } /* - * Convert from UUID to datastore URL form by stripping the second '-': + * Convert UUID to 'host.mountInfo.path' form by stripping the second '-': * * <---- 14 ----><-------- 22 --------> <---- 13 ---><-------- 22 --------> * 4b0beca7-7fd4-01f3-1d7f-000ae484a6a3 -> 4b0beca7-7fd401f3-1d7f-000ae484a6a3 @@ -317,14 +317,15 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virUUIDFormat(uuid, uuid_string); memmove(uuid_string + 13, uuid_string + 14, 22 + 1); - /* - * Use esxVI_LookupDatastoreByName because it also does try to match "UUID" - * part of the 'summary.url' property if there is no name match. - */ + if (virAsprintf(&absolutePath, "/vmfs/volumes/%s", uuid_string) < 0) { + virReportOOMError(); + goto cleanup; + } + if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupDatastoreByName(priv->primary, uuid_string, - propertyNameList, &datastore, - esxVI_Occurrence_OptionalItem) < 0) { + esxVI_LookupDatastoreByAbsolutePath(priv->primary, absolutePath, + propertyNameList, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { goto cleanup; } @@ -338,9 +339,16 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (datastore == NULL && STREQ(uuid_string + 17, "-0000-000000000000")) { uuid_string[17] = '\0'; - if (esxVI_LookupDatastoreByName(priv->primary, uuid_string, - propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0) { + VIR_FREE(absolutePath); + + if (virAsprintf(&absolutePath, "/vmfs/volumes/%s", uuid_string) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_LookupDatastoreByAbsolutePath(priv->primary, absolutePath, + propertyNameList, &datastore, + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } } @@ -348,7 +356,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (datastore == NULL) { virUUIDFormat(uuid, uuid_string); - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + ESX_VI_ERROR(VIR_ERR_NO_STORAGE_POOL, _("Could not find datastore with UUID '%s'"), uuid_string); @@ -363,6 +371,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) pool = virGetStoragePool(conn, name, uuid); cleanup: + VIR_FREE(absolutePath); esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 75a9aaf..7c7c841 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -274,12 +274,11 @@ esxUtil_ParseVirtualMachineIDString(const char *id_string, int *id) int -esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, - char **datastoreName, - char **directoryName, char **fileName) +esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, + char **directoryName, char **fileName) { int result = -1; - char *copyOfDatastoreRelatedPath = NULL; + char *copyOfDatastorePath = NULL; char *tmp = NULL; char *saveptr = NULL; char *preliminaryDatastoreName = NULL; @@ -293,18 +292,17 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, return -1; } - if (esxVI_String_DeepCopyValue(&copyOfDatastoreRelatedPath, - datastoreRelatedPath) < 0) { + if (esxVI_String_DeepCopyValue(&copyOfDatastorePath, datastorePath) < 0) { goto cleanup; } /* Expected format: '[<datastore>] <path>' */ - if ((tmp = STRSKIP(copyOfDatastoreRelatedPath, "[")) == NULL || + if ((tmp = STRSKIP(copyOfDatastorePath, "[")) == NULL || (preliminaryDatastoreName = strtok_r(tmp, "]", &saveptr)) == NULL || (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Datastore related path '%s' doesn't have expected format " - "'[<datastore>] <path>'"), datastoreRelatedPath); + _("Datastore path '%s' doesn't have expected format " + "'[<datastore>] <path>'"), datastorePath); goto cleanup; } @@ -323,8 +321,8 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, if (*separator == '\0') { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Datastore related path '%s' doesn't reference a file"), - datastoreRelatedPath); + _("Datastore path '%s' doesn't reference a file"), + datastorePath); goto cleanup; } @@ -348,7 +346,7 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, VIR_FREE(*fileName); } - VIR_FREE(copyOfDatastoreRelatedPath); + VIR_FREE(copyOfDatastorePath); return result; } diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 99ce81d..5799730 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -51,9 +51,8 @@ void esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri); int esxUtil_ParseVirtualMachineIDString(const char *id_string, int *id); -int esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, - char **datastoreName, - char **directoryName, char **fileName); +int esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, + char **directoryName, char **fileName); int esxUtil_ResolveHostname(const char *hostname, char *ipAddress, size_t ipAddress_length); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 9f2ac36..f421502 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2422,10 +2422,7 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_String *completePropertyNameList = NULL; esxVI_ObjectContent *datastoreList = NULL; esxVI_ObjectContent *candidate = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_Boolean accessible = esxVI_Boolean_Undefined; - size_t offset = 14; /* = strlen("/vmfs/volumes/") */ - int numInaccessibleDatastores = 0; + char *name_candidate; if (datastore == NULL || *datastore != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -2435,118 +2432,123 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, /* Get all datastores */ if (esxVI_String_DeepCopyList(&completePropertyNameList, propertyNameList) < 0 || - esxVI_String_AppendValueListToList(&completePropertyNameList, - "summary.accessible\0" - "summary.name\0" - "summary.url\0") < 0 || + esxVI_String_AppendValueToList(&completePropertyNameList, + "summary.name") < 0 || esxVI_LookupDatastoreList(ctx, completePropertyNameList, &datastoreList) < 0) { goto cleanup; } - if (datastoreList == NULL) { - if (occurrence == esxVI_Occurrence_OptionalItem) { - goto success; - } else { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("No datastores available")); + /* Search for a matching datastore */ + for (candidate = datastoreList; candidate != NULL; + candidate = candidate->_next) { + name_candidate = NULL; + + if (esxVI_GetStringValue(candidate, "summary.name", &name_candidate, + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } + + if (STREQ(name_candidate, name)) { + if (esxVI_ObjectContent_DeepCopy(datastore, candidate) < 0) { + goto cleanup; + } + + // Found datastore with matching name + goto success; + } + } + + if (*datastore == NULL && occurrence != esxVI_Occurrence_OptionalItem) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find datastore with name '%s'"), name); + goto cleanup; + } + + success: + result = 0; + + cleanup: + esxVI_String_Free(&completePropertyNameList); + esxVI_ObjectContent_Free(&datastoreList); + + return result; +} + + +int +esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, + const char *absolutePath, + esxVI_String *propertyNameList, + esxVI_ObjectContent **datastore, + esxVI_Occurrence occurrence) +{ + int result = -1; + esxVI_String *completePropertyNameList = NULL; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *candidate = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_DatastoreHostMount *datastoreHostMountList = NULL; + esxVI_DatastoreHostMount *datastoreHostMount = NULL; + + if (datastore == NULL || *datastore != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + /* Get all datastores */ + if (esxVI_String_DeepCopyList(&completePropertyNameList, + propertyNameList) < 0 || + esxVI_String_AppendValueToList(&completePropertyNameList, "host") < 0 || + esxVI_LookupDatastoreList(ctx, completePropertyNameList, + &datastoreList) < 0) { + goto cleanup; } /* Search for a matching datastore */ for (candidate = datastoreList; candidate != NULL; candidate = candidate->_next) { - accessible = esxVI_Boolean_Undefined; + esxVI_DatastoreHostMount_Free(&datastoreHostMountList); for (dynamicProperty = candidate->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.accessible")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Boolean) < 0) { + if (STREQ(dynamicProperty->name, "host")) { + if (esxVI_DatastoreHostMount_CastListFromAnyType + (dynamicProperty->val, &datastoreHostMountList) < 0) { goto cleanup; } - accessible = dynamicProperty->val->boolean; break; } } - if (accessible == esxVI_Boolean_Undefined) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Got incomplete response while querying for the " - "datastore 'summary.accessible' property")); - goto cleanup; - } - - if (accessible == esxVI_Boolean_False) { - ++numInaccessibleDatastores; + if (datastoreHostMountList == NULL) { + continue; } - for (dynamicProperty = candidate->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.name")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { - goto cleanup; - } - - if (STREQ(dynamicProperty->val->string, name)) { - if (esxVI_ObjectContent_DeepCopy(datastore, - candidate) < 0) { - goto cleanup; - } - - /* Found datastore with matching name */ - goto success; - } - } else if (STREQ(dynamicProperty->name, "summary.url") && - ctx->productVersion & esxVI_ProductVersion_ESX) { - if (accessible == esxVI_Boolean_False) { - /* - * The 'summary.url' property of an inaccessible datastore - * is invalid and cannot be used to identify the datastore. - */ - continue; - } + for (datastoreHostMount = datastoreHostMountList; + datastoreHostMount != NULL; + datastoreHostMount = datastoreHostMount->_next) { + if (STRNEQ(ctx->hostSystem->_reference->value, + datastoreHostMount->key->value)) { + continue; + } - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { + if (STRPREFIX(absolutePath, datastoreHostMount->mountInfo->path)) { + if (esxVI_ObjectContent_DeepCopy(datastore, candidate) < 0) { goto cleanup; } - if (! STRPREFIX(dynamicProperty->val->string, - "/vmfs/volumes/")) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Datastore URL '%s' has unexpected prefix, " - "expecting '/vmfs/volumes/' prefix"), - dynamicProperty->val->string); - goto cleanup; - } - - if (STREQ(dynamicProperty->val->string + offset, name)) { - if (esxVI_ObjectContent_DeepCopy(datastore, - candidate) < 0) { - goto cleanup; - } - - /* Found datastore with matching URL suffix */ - goto success; - } + /* Found datastore with matching mount path */ + goto success; } } } - if (occurrence != esxVI_Occurrence_OptionalItem) { - if (numInaccessibleDatastores > 0) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not find datastore '%s', maybe it's " - "inaccessible"), name); - } else { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not find datastore '%s'"), name); - } - + if (*datastore == NULL && occurrence != esxVI_Occurrence_OptionalItem) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find datastore containing absolute path '%s'"), + absolutePath); goto cleanup; } @@ -2556,6 +2558,7 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, cleanup: esxVI_String_Free(&completePropertyNameList); esxVI_ObjectContent_Free(&datastoreList); + esxVI_DatastoreHostMount_Free(&datastoreHostMountList); return result; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index a23c56d..fdd15f1 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -364,6 +364,12 @@ int esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_ObjectContent **datastore, esxVI_Occurrence occurrence); +int esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, + const char *absolutePath, + esxVI_String *propertyNameList, + esxVI_ObjectContent **datastore, + esxVI_Occurrence occurrence); + int esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, esxVI_ManagedObjectReference *task, esxVI_TaskInfo **taskInfo); diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index b4b33f6..ab50ea5 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -146,6 +146,12 @@ object ChoiceOption extends OptionType end +object DatastoreHostMount + ManagedObjectReference key r + HostMountInfo mountInfo r +end + + object DatastoreInfo String name r String url r @@ -251,6 +257,13 @@ object HostFileSystemVolume end +object HostMountInfo + String path o + String accessMode r + Boolean accessible o +end + + object HostNasVolume extends HostFileSystemVolume String remoteHost r String remotePath r diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 44c3493..e3c3d14 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1127,7 +1127,8 @@ additional_enum_features = { "ManagedEntityStatus" : Enum.FEATURE__ANY_TYPE "VirtualMachinePowerState" : Enum.FEATURE__ANY_TYPE } -additional_object_features = { "DatastoreInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST, +additional_object_features = { "DatastoreHostMount" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, + "DatastoreInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST, "Event" : Object.FEATURE__LIST, "FileInfo" : Object.FEATURE__DYNAMIC_CAST, "FileQuery" : Object.FEATURE__DYNAMIC_CAST, diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 807c6db..1a5e8d3 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -749,8 +749,8 @@ esxVMX_AutodetectSCSIControllerModel(esxVI_Context *ctx, return 0; } - if (esxUtil_ParseDatastoreRelatedPath(def->src, &datastoreName, - &directoryName, &fileName) < 0) { + if (esxUtil_ParseDatastorePath(def->src, &datastoreName, &directoryName, + &fileName) < 0) { goto cleanup; } @@ -986,19 +986,19 @@ esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, char * -esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, - const char *absolutePath) +esxVMX_AbsolutePathToDatastorePath(esxVI_Context *ctx, const char *absolutePath) { bool success = false; char *copyOfAbsolutePath = NULL; char *tmp = NULL; char *saveptr = NULL; - char *datastoreRelatedPath = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + + char *datastorePath = NULL; char *preliminaryDatastoreName = NULL; char *directoryAndFileName = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_ObjectContent *datastore = NULL; - const char *datastoreName = NULL; + char *datastoreName = NULL; if (esxVI_String_DeepCopyValue(&copyOfAbsolutePath, absolutePath) < 0) { return NULL; @@ -1015,30 +1015,26 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, } if (ctx != NULL) { - if (esxVI_LookupDatastoreByName(ctx, preliminaryDatastoreName, - NULL, &datastore, - esxVI_Occurrence_OptionalItem) < 0) { + if (esxVI_String_AppendValueToList(&propertyNameList, + "summary.name") < 0 || + esxVI_LookupDatastoreByAbsolutePath(ctx, absolutePath, + propertyNameList, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { goto cleanup; } - if (datastore != NULL) { - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.accessible")) { - /* Ignore it */ - } else if (STREQ(dynamicProperty->name, "summary.name")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { - goto cleanup; - } + if (datastore == NULL) { + if (esxVI_LookupDatastoreByName(ctx, preliminaryDatastoreName, + propertyNameList, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + } - datastoreName = dynamicProperty->val->string; - break; - } else if (STREQ(dynamicProperty->name, "summary.url")) { - /* Ignore it */ - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); - } + if (datastore != NULL) { + if (esxVI_GetStringValue(datastore, "summary.name", &datastoreName, + esxVI_Occurrence_RequiredItem)) { + goto cleanup; } } @@ -1053,7 +1049,7 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, datastoreName = preliminaryDatastoreName; } - if (virAsprintf(&datastoreRelatedPath, "[%s] %s", datastoreName, + if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, directoryAndFileName) < 0) { virReportOOMError(); goto cleanup; @@ -1065,13 +1061,14 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, cleanup: if (! success) { - VIR_FREE(datastoreRelatedPath); + VIR_FREE(datastorePath); } VIR_FREE(copyOfAbsolutePath); + esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); - return datastoreRelatedPath; + return datastorePath; } @@ -1088,7 +1085,7 @@ esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, if (STRPREFIX(fileName, "/vmfs/volumes/")) { /* Found absolute path referencing a file inside a datastore */ - return esxVMX_AbsolutePathToDatastoreRelatedPath(ctx, fileName); + return esxVMX_AbsolutePathToDatastorePath(ctx, fileName); } else if (STRPREFIX(fileName, "/")) { /* Found absolute path referencing a file outside a datastore */ src = strdup(fileName); @@ -2625,8 +2622,8 @@ esxVMX_FormatFileName(esxVI_Context *ctx ATTRIBUTE_UNUSED, const char *src) if (STRPREFIX(src, "[")) { /* Found potential datastore related path */ - if (esxUtil_ParseDatastoreRelatedPath(src, &datastoreName, - &directoryName, &fileName) < 0) { + if (esxUtil_ParseDatastorePath(src, &datastoreName, &directoryName, + &fileName) < 0) { goto cleanup; } diff --git a/src/esx/esx_vmx.h b/src/esx/esx_vmx.h index 3ccae7a..bda98f0 100644 --- a/src/esx/esx_vmx.h +++ b/src/esx/esx_vmx.h @@ -56,8 +56,7 @@ esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, int virtualDev[4], bool present[4]); char * -esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, - const char *absolutePath); +esxVMX_AbsolutePathToDatastorePath(esxVI_Context *ctx, const char *absolutePath); diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index 2a13282..09470ed 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -95,7 +95,7 @@ testDiskNameToIndex(const void *data ATTRIBUTE_UNUSED) struct testPath { - const char *datastoreRelatedPath; + const char *datastorePath; int result; const char *datastoreName; const char *directoryName; @@ -111,7 +111,7 @@ static struct testPath paths[] = { }; static int -testParseDatastoreRelatedPath(const void *data ATTRIBUTE_UNUSED) +testParseDatastorePath(const void *data ATTRIBUTE_UNUSED) { int i, result = 0; char *datastoreName = NULL; @@ -123,9 +123,9 @@ testParseDatastoreRelatedPath(const void *data ATTRIBUTE_UNUSED) VIR_FREE(directoryName); VIR_FREE(fileName); - if (esxUtil_ParseDatastoreRelatedPath(paths[i].datastoreRelatedPath, - &datastoreName, &directoryName, - &fileName) != paths[i].result) { + if (esxUtil_ParseDatastorePath(paths[i].datastorePath, + &datastoreName, &directoryName, + &fileName) != paths[i].result) { goto failure; } @@ -242,7 +242,7 @@ mymain(int argc, char **argv) virSetErrorFunc(NULL, testQuietError); -# define DO_TEST(_name) \ +# define DO_TEST(_name) \ do { \ if (virtTestRun("VMware "#_name, 1, test##_name, \ NULL) < 0) { \ @@ -252,7 +252,7 @@ mymain(int argc, char **argv) DO_TEST(IndexToDiskName); DO_TEST(DiskNameToIndex); - DO_TEST(ParseDatastoreRelatedPath); + DO_TEST(ParseDatastorePath); DO_TEST(ConvertDateTimeToCalendarTime); return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Map some managed object types
by Matthias Bolte 02 Aug '10

02 Aug '10

Datacenter, ComputeResource and HostSystem will be used for simplified handling and caching. --- src/esx/esx_vi_types.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi_types.h | 96 ++++++++++++++++ 2 files changed, 379 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 5cf30b1..bb791af 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -704,6 +704,15 @@ esxVI_Type_ToString(esxVI_Type type) case esxVI_Type_ManagedObjectReference: return "ManagedObjectReference"; + case esxVI_Type_Datacenter: + return "Datacenter"; + + case esxVI_Type_ComputeResource: + return "ComputeResource"; + + case esxVI_Type_HostSystem: + return "HostSystem"; + #include "esx_vi_types.generated.typetostring" case esxVI_Type_Other: @@ -734,8 +743,15 @@ esxVI_Type_FromString(const char *type) return esxVI_Type_Fault; } else if (STREQ(type, "ManagedObjectReference")) { return esxVI_Type_ManagedObjectReference; + } else if (STREQ(type, "Datacenter")) { + return esxVI_Type_Datacenter; + } else if (STREQ(type, "ComputeResource")) { + return esxVI_Type_ComputeResource; + } else if (STREQ(type, "HostSystem")) { + return esxVI_Type_HostSystem; } + #include "esx_vi_types.generated.typefromstring" else { @@ -1532,6 +1548,273 @@ esxVI_ManagedObjectReference_Deserialize /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: Datacenter + * extends ManagedEntity + */ + +/* esxVI_Datacenter_Alloc */ +ESX_VI__TEMPLATE__ALLOC(Datacenter) + +/* esxVI_Datacenter_Free */ +ESX_VI__TEMPLATE__FREE(Datacenter, +{ + esxVI_Datacenter_Free(&item->_next); + esxVI_ManagedObjectReference_Free(&item->_reference); + + /* ManagedEntity */ + VIR_FREE(item->name); + + /* Datacenter */ + esxVI_ManagedObjectReference_Free(&item->hostFolder); + esxVI_ManagedObjectReference_Free(&item->vmFolder); +}) + +/* esxVI_Datacenter_Validate */ +ESX_VI__TEMPLATE__VALIDATE(Datacenter, +{ + /* ManagedEntity */ + ESX_VI__TEMPLATE__PROPERTY__REQUIRE(name); + + /* Datacenter */ + ESX_VI__TEMPLATE__PROPERTY__REQUIRE(hostFolder); + ESX_VI__TEMPLATE__PROPERTY__REQUIRE(vmFolder); +}) + +int +esxVI_Datacenter_CastFromObjectContent(esxVI_ObjectContent *objectContent, + esxVI_Datacenter **datacenter) +{ + esxVI_DynamicProperty *dynamicProperty = NULL; + + if (objectContent == NULL || datacenter == NULL || *datacenter != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_Datacenter_Alloc(datacenter) < 0) { + return -1; + } + + if (esxVI_ManagedObjectReference_DeepCopy(&(*datacenter)->_reference, + objectContent->obj) < 0) { + goto failure; + } + + for (dynamicProperty = objectContent->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "name")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_String) < 0) { + goto failure; + } + + (*datacenter)->name = strdup(dynamicProperty->val->string); + + if ((*datacenter)->name == NULL) { + virReportOOMError(); + goto failure; + } + } else if (STREQ(dynamicProperty->name, "hostFolder")) { + if (esxVI_ManagedObjectReference_CastFromAnyType + (dynamicProperty->val, &(*datacenter)->hostFolder) < 0) { + goto failure; + } + } else if (STREQ(dynamicProperty->name, "vmFolder")) { + if (esxVI_ManagedObjectReference_CastFromAnyType + (dynamicProperty->val, &(*datacenter)->vmFolder) < 0) { + goto failure; + } + } + } + + if (esxVI_Datacenter_Validate(*datacenter) < 0) { + goto failure; + } + + return 0; + + failure: + esxVI_Datacenter_Free(datacenter); + + return -1; +} + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: ComputeResource + * extends ManagedEntity + */ + +/* esxVI_ComputeResource_Alloc */ +ESX_VI__TEMPLATE__ALLOC(ComputeResource) + +/* esxVI_ComputeResource_Free */ +ESX_VI__TEMPLATE__FREE(ComputeResource, +{ + esxVI_ComputeResource_Free(&item->_next); + esxVI_ManagedObjectReference_Free(&item->_reference); + + /* ManagedEntity */ + VIR_FREE(item->name); + + /* ComputeResource */ + esxVI_ManagedObjectReference_Free(&item->host); + esxVI_ManagedObjectReference_Free(&item->resourcePool); +}) + +/* esxVI_ComputeResource_Validate */ +ESX_VI__TEMPLATE__VALIDATE(ComputeResource, +{ + /* ManagedEntity */ + ESX_VI__TEMPLATE__PROPERTY__REQUIRE(name); + + /* ComputeResource */ +}) + +int +esxVI_ComputeResource_CastFromObjectContent + (esxVI_ObjectContent *objectContent, esxVI_ComputeResource **computeResource) +{ + esxVI_DynamicProperty *dynamicProperty = NULL; + + if (objectContent == NULL || computeResource == NULL || + *computeResource != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_ComputeResource_Alloc(computeResource) < 0) { + return -1; + } + + if (esxVI_ManagedObjectReference_DeepCopy(&(*computeResource)->_reference, + objectContent->obj) < 0) { + goto failure; + } + + for (dynamicProperty = objectContent->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "name")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_String) < 0) { + goto failure; + } + + (*computeResource)->name = strdup(dynamicProperty->val->string); + + if ((*computeResource)->name == NULL) { + virReportOOMError(); + goto failure; + } + } else if (STREQ(dynamicProperty->name, "host")) { + if (esxVI_ManagedObjectReference_CastListFromAnyType + (dynamicProperty->val, &(*computeResource)->host) < 0) { + goto failure; + } + } else if (STREQ(dynamicProperty->name, "resourcePool")) { + if (esxVI_ManagedObjectReference_CastFromAnyType + (dynamicProperty->val, &(*computeResource)->resourcePool) < 0) { + goto failure; + } + } + } + + if (esxVI_ComputeResource_Validate(*computeResource) < 0) { + goto failure; + } + + return 0; + + failure: + esxVI_ComputeResource_Free(computeResource); + + return -1; +} + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: HostSystem + * extends ManagedEntity + */ + +/* esxVI_HostSystem_Alloc */ +ESX_VI__TEMPLATE__ALLOC(HostSystem) + +/* esxVI_HostSystem_Free */ +ESX_VI__TEMPLATE__FREE(HostSystem, +{ + esxVI_HostSystem_Free(&item->_next); + esxVI_ManagedObjectReference_Free(&item->_reference); + + /* ManagedEntity */ + VIR_FREE(item->name); + + /* HostSystem */ +}) + +/* esxVI_HostSystem_Validate */ +ESX_VI__TEMPLATE__VALIDATE(HostSystem, +{ + /* ManagedEntity */ + ESX_VI__TEMPLATE__PROPERTY__REQUIRE(name); + + /* HostSystem */ +}) + +int +esxVI_HostSystem_CastFromObjectContent(esxVI_ObjectContent *objectContent, + esxVI_HostSystem **hostSystem) +{ + esxVI_DynamicProperty *dynamicProperty = NULL; + + if (objectContent == NULL || hostSystem == NULL || *hostSystem != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_HostSystem_Alloc(hostSystem) < 0) { + return -1; + } + + if (esxVI_ManagedObjectReference_DeepCopy(&(*hostSystem)->_reference, + objectContent->obj) < 0) { + goto failure; + } + + for (dynamicProperty = objectContent->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "name")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_String) < 0) { + goto failure; + } + + (*hostSystem)->name = strdup(dynamicProperty->val->string); + + if ((*hostSystem)->name == NULL) { + virReportOOMError(); + goto failure; + } + } + } + + if (esxVI_HostSystem_Validate(*hostSystem) < 0) { + goto failure; + } + + return 0; + + failure: + esxVI_HostSystem_Free(hostSystem); + + return -1; +} + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * VI Enum: VirtualMachinePowerState (Additions) */ diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 4bedca9..f659361 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -26,6 +26,7 @@ typedef enum _esxVI_Type esxVI_Type; typedef struct _esxVI_Object esxVI_Object; +typedef struct _esxVI_ManagedObject esxVI_ManagedObject; @@ -48,6 +49,9 @@ typedef struct _esxVI_DateTime esxVI_DateTime; typedef struct _esxVI_Fault esxVI_Fault; typedef struct _esxVI_ManagedObjectReference esxVI_ManagedObjectReference; +typedef struct _esxVI_Datacenter esxVI_Datacenter; +typedef struct _esxVI_ComputeResource esxVI_ComputeResource; +typedef struct _esxVI_HostSystem esxVI_HostSystem; # include "esx_vi_types.generated.typedef" @@ -68,6 +72,9 @@ enum _esxVI_Type { esxVI_Type_DateTime, esxVI_Type_Fault, esxVI_Type_ManagedObjectReference, + esxVI_Type_Datacenter, + esxVI_Type_ComputeResource, + esxVI_Type_HostSystem, # include "esx_vi_types.generated.typeenum" @@ -91,6 +98,18 @@ struct _esxVI_Object { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * ManagedObject extends Object + */ + +struct _esxVI_ManagedObject { + esxVI_ManagedObject *_next; /* optional */ + esxVI_Type _type; /* required */ + esxVI_ManagedObjectReference *_reference; /* required */ +}; + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * XSD: Boolean */ @@ -301,6 +320,83 @@ int esxVI_ManagedObjectReference_Deserialize /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: Datacenter + * extends ManagedEntity + */ + +struct _esxVI_Datacenter { + esxVI_Datacenter *_next; /* optional */ + esxVI_Type _type; /* required */ + esxVI_ManagedObjectReference *_reference; /* required */ + + /* ManagedEntity */ + char *name; /* required */ + + /* Datacenter */ + esxVI_ManagedObjectReference *hostFolder; /* required */ + esxVI_ManagedObjectReference *vmFolder; /* required */ +}; + +int esxVI_Datacenter_Alloc(esxVI_Datacenter **datacenter); +void esxVI_Datacenter_Free(esxVI_Datacenter **datacenter); +int esxVI_Datacenter_Validate(esxVI_Datacenter *datacenter); +int esxVI_Datacenter_CastFromObjectContent(esxVI_ObjectContent *objectContent, + esxVI_Datacenter **datacenter); + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: ComputeResource + * extends ManagedEntity + */ + +struct _esxVI_ComputeResource { + esxVI_ComputeResource *_next; /* optional */ + esxVI_Type _type; /* required */ + esxVI_ManagedObjectReference *_reference; /* required */ + + /* ManagedEntity */ + char *name; /* required */ + + /* ComputeResource */ + esxVI_ManagedObjectReference *host; /* optional, list */ + esxVI_ManagedObjectReference *resourcePool; /* optional */ +}; + +int esxVI_ComputeResource_Alloc(esxVI_ComputeResource **computeResource); +void esxVI_ComputeResource_Free(esxVI_ComputeResource **computeResource); +int esxVI_ComputeResource_Validate(esxVI_ComputeResource *computeResource); +int esxVI_ComputeResource_CastFromObjectContent + (esxVI_ObjectContent *objectContent, + esxVI_ComputeResource **computeResource); + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: HostSystem + * extends ManagedEntity + */ + +struct _esxVI_HostSystem { + esxVI_HostSystem *_next; /* optional */ + esxVI_Type _type; /* required */ + esxVI_ManagedObjectReference *_reference; /* required */ + + /* ManagedEntity */ + char *name; /* required */ + + /* HostSystem */ +}; + +int esxVI_HostSystem_Alloc(esxVI_HostSystem **hostSystem); +void esxVI_HostSystem_Free(esxVI_HostSystem **hostSystem); +int esxVI_HostSystem_Validate(esxVI_HostSystem *hostSystem); +int esxVI_HostSystem_CastFromObjectContent(esxVI_ObjectContent *objectContent, + esxVI_HostSystem **hostSystem); + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * VI Enum: VirtualMachinePowerState (Additions) */ -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Parse the path of the URI
by Matthias Bolte 02 Aug '10

02 Aug '10

The path will be used to specify the datacenter, compute resource and host system to be used with a vpx:// connection. --- src/esx/esx_driver.c | 49 ++++++++++------------- src/esx/esx_util.c | 104 +++++++++++++++++++++++++++++++------------------- src/esx/esx_util.h | 11 +++-- src/esx/esx_vi.c | 14 +++--- src/esx/esx_vi.h | 3 +- 5 files changed, 102 insertions(+), 79 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 913420c..3bdc551 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -294,7 +294,7 @@ static int esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, const char *hostname, int port, const char *predefinedUsername, - esxUtil_ParsedQuery *parsedQuery, + esxUtil_ParsedUri *parsedUri, esxVI_ProductVersion expectedProductVersion, char **vCenterIpAddress) { @@ -347,7 +347,7 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, if (esxVI_Context_Alloc(&priv->host) < 0 || esxVI_Context_Connect(priv->host, url, ipAddress, username, password, - parsedQuery) < 0) { + parsedUri) < 0) { goto cleanup; } @@ -416,7 +416,7 @@ static int esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, const char *hostname, int port, const char *predefinedUsername, - esxUtil_ParsedQuery *parsedQuery) + esxUtil_ParsedUri *parsedUri) { int result = -1; char ipAddress[NI_MAXHOST] = ""; @@ -459,7 +459,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, if (esxVI_Context_Alloc(&priv->vCenter) < 0 || esxVI_Context_Connect(priv->vCenter, url, ipAddress, username, - password, parsedQuery) < 0) { + password, parsedUri) < 0) { goto cleanup; } @@ -528,7 +528,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) { virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; esxPrivate *priv = NULL; - esxUtil_ParsedQuery *parsedQuery = NULL; + esxUtil_ParsedUri *parsedUri = NULL; char *potentialVCenterIpAddress = NULL; char vCenterIpAddress[NI_MAXHOST] = ""; @@ -545,29 +545,24 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) return VIR_DRV_OPEN_DECLINED; } - if (conn->uri->path != NULL && STRNEQ(conn->uri->path, "") && - STRNEQ(conn->uri->path, "/")) { - VIR_WARN("Ignoring unexpected path '%s' in URI", conn->uri->path); - } - /* Allocate per-connection private data */ if (VIR_ALLOC(priv) < 0) { virReportOOMError(); goto cleanup; } - if (esxUtil_ParseQuery(&parsedQuery, conn->uri) < 0) { + if (esxUtil_ParseUri(&parsedUri, conn->uri) < 0) { goto cleanup; } - priv->transport = parsedQuery->transport; - parsedQuery->transport = NULL; + priv->transport = parsedUri->transport; + parsedUri->transport = NULL; priv->maxVcpus = -1; priv->supportsVMotion = esxVI_Boolean_Undefined; priv->supportsLongMode = esxVI_Boolean_Undefined; - priv->autoAnswer = parsedQuery->autoAnswer ? esxVI_Boolean_True - : esxVI_Boolean_False; + priv->autoAnswer = parsedUri->autoAnswer ? esxVI_Boolean_True + : esxVI_Boolean_False; priv->usedCpuTimeCounterId = -1; /* @@ -597,7 +592,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) STRCASEEQ(conn->uri->scheme, "gsx")) { /* Connect to host */ if (esxConnectToHost(priv, auth, conn->uri->server, conn->uri->port, - conn->uri->user, parsedQuery, + conn->uri->user, parsedUri, STRCASEEQ(conn->uri->scheme, "esx") ? esxVI_ProductVersion_ESX : esxVI_ProductVersion_GSX, @@ -606,8 +601,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } /* Connect to vCenter */ - if (parsedQuery->vCenter != NULL) { - if (STREQ(parsedQuery->vCenter, "*")) { + if (parsedUri->vCenter != NULL) { + if (STREQ(parsedUri->vCenter, "*")) { if (potentialVCenterIpAddress == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("This host is not managed by a vCenter")); @@ -622,7 +617,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) goto cleanup; } } else { - if (esxUtil_ResolveHostname(parsedQuery->vCenter, + if (esxUtil_ResolveHostname(parsedUri->vCenter, vCenterIpAddress, NI_MAXHOST) < 0) { goto cleanup; } @@ -633,14 +628,14 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) _("This host is managed by a vCenter with IP " "address %s, but a mismachting vCenter '%s' " "(%s) has been specified"), - potentialVCenterIpAddress, parsedQuery->vCenter, + potentialVCenterIpAddress, parsedUri->vCenter, vCenterIpAddress); goto cleanup; } } if (esxConnectToVCenter(priv, auth, vCenterIpAddress, - conn->uri->port, NULL, parsedQuery) < 0) { + conn->uri->port, NULL, parsedUri) < 0) { goto cleanup; } } @@ -649,7 +644,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } else { /* VPX */ /* Connect to vCenter */ if (esxConnectToVCenter(priv, auth, conn->uri->server, conn->uri->port, - conn->uri->user, parsedQuery) < 0) { + conn->uri->user, parsedUri) < 0) { goto cleanup; } @@ -678,7 +673,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) VIR_FREE(priv); } - esxUtil_FreeParsedQuery(&parsedQuery); + esxUtil_FreeParsedUri(&parsedUri); VIR_FREE(potentialVCenterIpAddress); return result; @@ -3113,14 +3108,14 @@ esxDomainMigratePrepare(virConnectPtr dconn, unsigned long resource ATTRIBUTE_UNUSED) { int result = -1; - esxUtil_ParsedQuery *parsedQuery = NULL; + esxUtil_ParsedUri *parsedUri = NULL; if (uri_in == NULL) { - if (esxUtil_ParseQuery(&parsedQuery, dconn->uri) < 0) { + if (esxUtil_ParseUri(&parsedUri, dconn->uri) < 0) { return -1; } - if (virAsprintf(uri_out, "%s://%s:%d/sdk", parsedQuery->transport, + if (virAsprintf(uri_out, "%s://%s:%d/sdk", parsedUri->transport, dconn->uri->server, dconn->uri->port) < 0) { virReportOOMError(); goto cleanup; @@ -3130,7 +3125,7 @@ esxDomainMigratePrepare(virConnectPtr dconn, result = 0; cleanup: - esxUtil_FreeParsedQuery(&parsedQuery); + esxUtil_FreeParsedUri(&parsedUri); return result; } diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index d79de2c..75a9aaf 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -41,7 +41,7 @@ int -esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) +esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri) { int result = -1; struct qparam_set *queryParamSet = NULL; @@ -50,13 +50,14 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) int noVerify; int autoAnswer; char *tmp; + char *saveptr; - if (parsedQuery == NULL || *parsedQuery != NULL) { + if (parsedUri == NULL || *parsedUri != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } - if (VIR_ALLOC(*parsedQuery) < 0) { + if (VIR_ALLOC(*parsedUri) < 0) { virReportOOMError(); return -1; } @@ -75,29 +76,29 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) queryParam = &queryParamSet->p[i]; if (STRCASEEQ(queryParam->name, "transport")) { - VIR_FREE((*parsedQuery)->transport); + VIR_FREE((*parsedUri)->transport); - (*parsedQuery)->transport = strdup(queryParam->value); + (*parsedUri)->transport = strdup(queryParam->value); - if ((*parsedQuery)->transport == NULL) { + if ((*parsedUri)->transport == NULL) { virReportOOMError(); goto cleanup; } - if (STRNEQ((*parsedQuery)->transport, "http") && - STRNEQ((*parsedQuery)->transport, "https")) { + if (STRNEQ((*parsedUri)->transport, "http") && + STRNEQ((*parsedUri)->transport, "https")) { ESX_ERROR(VIR_ERR_INVALID_ARG, _("Query parameter 'transport' has unexpected value " "'%s' (should be http|https)"), - (*parsedQuery)->transport); + (*parsedUri)->transport); goto cleanup; } } else if (STRCASEEQ(queryParam->name, "vcenter")) { - VIR_FREE((*parsedQuery)->vCenter); + VIR_FREE((*parsedUri)->vCenter); - (*parsedQuery)->vCenter = strdup(queryParam->value); + (*parsedUri)->vCenter = strdup(queryParam->value); - if ((*parsedQuery)->vCenter == NULL) { + if ((*parsedUri)->vCenter == NULL) { virReportOOMError(); goto cleanup; } @@ -110,7 +111,7 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) goto cleanup; } - (*parsedQuery)->noVerify = noVerify != 0; + (*parsedUri)->noVerify = noVerify != 0; } else if (STRCASEEQ(queryParam->name, "auto_answer")) { if (virStrToLong_i(queryParam->value, NULL, 10, &autoAnswer) < 0 || (autoAnswer != 0 && autoAnswer != 1)) { @@ -120,23 +121,23 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) goto cleanup; } - (*parsedQuery)->autoAnswer = autoAnswer != 0; + (*parsedUri)->autoAnswer = autoAnswer != 0; } else if (STRCASEEQ(queryParam->name, "proxy")) { /* Expected format: [<type>://]<hostname>[:<port>] */ - (*parsedQuery)->proxy = true; - (*parsedQuery)->proxy_type = CURLPROXY_HTTP; - VIR_FREE((*parsedQuery)->proxy_hostname); - (*parsedQuery)->proxy_port = 1080; + (*parsedUri)->proxy = true; + (*parsedUri)->proxy_type = CURLPROXY_HTTP; + VIR_FREE((*parsedUri)->proxy_hostname); + (*parsedUri)->proxy_port = 1080; if ((tmp = STRSKIP(queryParam->value, "http://")) != NULL) { - (*parsedQuery)->proxy_type = CURLPROXY_HTTP; + (*parsedUri)->proxy_type = CURLPROXY_HTTP; } else if ((tmp = STRSKIP(queryParam->value, "socks://")) != NULL || (tmp = STRSKIP(queryParam->value, "socks5://")) != NULL) { - (*parsedQuery)->proxy_type = CURLPROXY_SOCKS5; + (*parsedUri)->proxy_type = CURLPROXY_SOCKS5; } else if ((tmp = STRSKIP(queryParam->value, "socks4://")) != NULL) { - (*parsedQuery)->proxy_type = CURLPROXY_SOCKS4; + (*parsedUri)->proxy_type = CURLPROXY_SOCKS4; } else if ((tmp = STRSKIP(queryParam->value, "socks4a://")) != NULL) { - (*parsedQuery)->proxy_type = CURLPROXY_SOCKS4A; + (*parsedUri)->proxy_type = CURLPROXY_SOCKS4A; } else if ((tmp = strstr(queryParam->value, "://")) != NULL) { *tmp = '\0'; @@ -149,15 +150,15 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) tmp = queryParam->value; } - (*parsedQuery)->proxy_hostname = strdup(tmp); + (*parsedUri)->proxy_hostname = strdup(tmp); - if ((*parsedQuery)->proxy_hostname == NULL) { + if ((*parsedUri)->proxy_hostname == NULL) { virReportOOMError(); goto cleanup; } - if ((tmp = strchr((*parsedQuery)->proxy_hostname, ':')) != NULL) { - if (tmp == (*parsedQuery)->proxy_hostname) { + if ((tmp = strchr((*parsedUri)->proxy_hostname, ':')) != NULL) { + if (tmp == (*parsedUri)->proxy_hostname) { ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", _("Query parameter 'proxy' doesn't contain a " "hostname")); @@ -167,9 +168,9 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) *tmp++ = '\0'; if (virStrToLong_i(tmp, NULL, 10, - &(*parsedQuery)->proxy_port) < 0 || - (*parsedQuery)->proxy_port < 1 || - (*parsedQuery)->proxy_port > 65535) { + &(*parsedUri)->proxy_port) < 0 || + (*parsedUri)->proxy_port < 1 || + (*parsedUri)->proxy_port > 65535) { ESX_ERROR(VIR_ERR_INVALID_ARG, _("Query parameter 'proxy' has unexpected port" "value '%s' (should be [1..65535])"), tmp); @@ -182,10 +183,32 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) } } - if ((*parsedQuery)->transport == NULL) { - (*parsedQuery)->transport = strdup("https"); + /* Expected format: [/]<datacenter>/<computeresource>[/<hostsystem>] */ + if (uri->path != NULL) { + tmp = strdup(uri->path); - if ((*parsedQuery)->transport == NULL) { + if (tmp == NULL) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_String_DeepCopyValue(&(*parsedUri)->path_datacenter, + strtok_r(tmp, "/", &saveptr)) < 0 || + esxVI_String_DeepCopyValue(&(*parsedUri)->path_computeResource, + strtok_r(NULL, "/", &saveptr)) < 0 || + esxVI_String_DeepCopyValue(&(*parsedUri)->path_hostSystem, + strtok_r(NULL, "", &saveptr)) < 0) { + VIR_FREE(tmp); + goto cleanup; + } + + VIR_FREE(tmp); + } + + if ((*parsedUri)->transport == NULL) { + (*parsedUri)->transport = strdup("https"); + + if ((*parsedUri)->transport == NULL) { virReportOOMError(); goto cleanup; } @@ -195,7 +218,7 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) cleanup: if (result < 0) { - esxUtil_FreeParsedQuery(parsedQuery); + esxUtil_FreeParsedUri(parsedUri); } if (queryParamSet != NULL) { @@ -209,17 +232,20 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) void -esxUtil_FreeParsedQuery(esxUtil_ParsedQuery **parsedQuery) +esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri) { - if (parsedQuery == NULL || *parsedQuery == NULL) { + if (parsedUri == NULL || *parsedUri == NULL) { return; } - VIR_FREE((*parsedQuery)->transport); - VIR_FREE((*parsedQuery)->vCenter); - VIR_FREE((*parsedQuery)->proxy_hostname); + VIR_FREE((*parsedUri)->transport); + VIR_FREE((*parsedUri)->vCenter); + VIR_FREE((*parsedUri)->proxy_hostname); + VIR_FREE((*parsedUri)->path_datacenter); + VIR_FREE((*parsedUri)->path_computeResource); + VIR_FREE((*parsedUri)->path_hostSystem); - VIR_FREE(*parsedQuery); + VIR_FREE(*parsedUri); } diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index a1927a6..99ce81d 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -29,9 +29,9 @@ # include "internal.h" # include "conf.h" -typedef struct _esxUtil_ParsedQuery esxUtil_ParsedQuery; +typedef struct _esxUtil_ParsedUri esxUtil_ParsedUri; -struct _esxUtil_ParsedQuery { +struct _esxUtil_ParsedUri { char *transport; char *vCenter; bool noVerify; @@ -40,11 +40,14 @@ struct _esxUtil_ParsedQuery { int proxy_type; char *proxy_hostname; int proxy_port; + char *path_datacenter; + char *path_computeResource; + char *path_hostSystem; }; -int esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri); +int esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri); -void esxUtil_FreeParsedQuery(esxUtil_ParsedQuery **parsedQuery); +void esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri); int esxUtil_ParseVirtualMachineIDString(const char *id_string, int *id); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 98b8bcd..5695881 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -277,7 +277,7 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) int esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, - const char *password, esxUtil_ParsedQuery *parsedQuery) + const char *password, esxUtil_ParsedUri *parsedUri) { int result = -1; esxVI_String *propertyNameList = NULL; @@ -329,9 +329,9 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_HEADER, 0); curl_easy_setopt(ctx->curl_handle, CURLOPT_FOLLOWLOCATION, 0); curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYPEER, - parsedQuery->noVerify ? 0 : 1); + parsedUri->noVerify ? 0 : 1); curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYHOST, - parsedQuery->noVerify ? 0 : 2); + parsedUri->noVerify ? 0 : 2); curl_easy_setopt(ctx->curl_handle, CURLOPT_COOKIEFILE, ""); curl_easy_setopt(ctx->curl_handle, CURLOPT_HTTPHEADER, ctx->curl_headers); curl_easy_setopt(ctx->curl_handle, CURLOPT_READFUNCTION, @@ -345,13 +345,13 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_VERBOSE, 1); #endif - if (parsedQuery->proxy) { + if (parsedUri->proxy) { curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXY, - parsedQuery->proxy_hostname); + parsedUri->proxy_hostname); curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXYTYPE, - parsedQuery->proxy_type); + parsedUri->proxy_type); curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXYPORT, - parsedQuery->proxy_port); + parsedUri->proxy_port); } if (virMutexInit(&ctx->curl_lock) < 0) { diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index ef9c6d9..325ba69 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -168,8 +168,7 @@ int esxVI_Context_Alloc(esxVI_Context **ctx); void esxVI_Context_Free(esxVI_Context **ctx); int esxVI_Context_Connect(esxVI_Context *ctx, const char *ipAddress, const char *url, const char *username, - const char *password, - esxUtil_ParsedQuery *parsedQuery); + const char *password, esxUtil_ParsedUri *parsedUri); int esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url, char **content); int esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url, -- 1.7.0.4

2 2

[libvirt] [PATCH] Add iptables rule to fixup DHCP response checksum.
by Laine Stump 02 Aug '10

02 Aug '10

From: Laine Stump <laine(a)redhat.com> (I don't know whether or not we want to commit this upstream yet - the proposed iptables and kernel module backend for the changes have been posted but not yet committed upstream. On the other hand, the new libvirt code ends up simply printing a warning message if the necessary iptables support isn't yet in place.) This patch attempts to take advantage of a newly added netfilter module to correct for a problem with some guest DHCP client implementations when used in conjunction with a DHCP server run on the host systems with packet checksum offloading enabled. The problem is that, when the guest uses a RAW socket to read the DHCP response packets, the checksum hasn't yet been fixed by the IP stack, so it is incorrect. The fix implemented here is to add a rule to the POSTROUTING chain of the mangle table in iptables that fixes up the checksum for packets on the virtual network's bridge that are destined for the bootpc port (ie "dhcpc", ie port 68) port on the guest. Only very new versions of iptables will have this support (it has been submitted upstream, but not yet committed), so a failure to add this rule only results in a warning message. The iptables patch is here: http://patchwork.ozlabs.org/patch/58525/ A corresponding kernel module patch is also required (the backend of the iptables patch) and has been submitted, but I don't have the details for that (I tested using a pre-built image I received from the developer, Michael Tsirkin). --- src/libvirt_private.syms | 2 + src/network/bridge_driver.c | 17 ++++++++++ src/util/iptables.c | 71 +++++++++++++++++++++++++++++++++++++++++++ src/util/iptables.h | 6 ++++ 4 files changed, 96 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 778ceb1..d81d4cf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -328,6 +328,7 @@ iptablesAddForwardAllowRelatedIn; iptablesAddForwardMasquerade; iptablesAddForwardRejectIn; iptablesAddForwardRejectOut; +iptablesAddOutputFixUdpChecksum; iptablesAddTcpInput; iptablesAddUdpInput; iptablesContextFree; @@ -339,6 +340,7 @@ iptablesRemoveForwardAllowRelatedIn; iptablesRemoveForwardMasquerade; iptablesRemoveForwardRejectIn; iptablesRemoveForwardRejectOut; +iptablesRemoveOutputFixUdpChecksum; iptablesRemoveTcpInput; iptablesRemoveUdpInput; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 72255c1..c4480ff 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -781,6 +781,19 @@ networkAddIptablesRules(struct network_driver *driver, !networkAddRoutingIptablesRules(driver, network)) goto err8; + /* If we are doing local DHCP service on this network, attempt to + * add a rule that will fixup the checksum of DHCP response + * packets back to the guests (but report failure without + * aborting, since not all iptables implementations support it). + */ + + if ((network->def->ipAddress || network->def->nranges) && + (iptablesAddOutputFixUdpChecksum(driver->iptables, + network->def->bridge, 68) != 0)) { + VIR_WARN("Could not add rule to fixup DHCP response checksums " + "on network '%s'", network->def->name); + } + return 1; err8: @@ -811,6 +824,10 @@ networkAddIptablesRules(struct network_driver *driver, static void networkRemoveIptablesRules(struct network_driver *driver, virNetworkObjPtr network) { + if (network->def->ipAddress || network->def->nranges) { + iptablesRemoveOutputFixUdpChecksum(driver->iptables, + network->def->bridge, 68); + } if (network->def->forwardType != VIR_NETWORK_FORWARD_NONE) { if (network->def->forwardType == VIR_NETWORK_FORWARD_NAT) { iptablesRemoveForwardMasquerade(driver->iptables, diff --git a/src/util/iptables.c b/src/util/iptables.c index d06b857..9b888e5 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -60,6 +60,7 @@ struct _iptablesContext iptRules *input_filter; iptRules *forward_filter; iptRules *nat_postrouting; + iptRules *mangle_postrouting; }; static void @@ -188,6 +189,9 @@ iptablesContextNew(void) if (!(ctx->nat_postrouting = iptRulesNew("nat", "POSTROUTING"))) goto error; + if (!(ctx->mangle_postrouting = iptRulesNew("mangle", "POSTROUTING"))) + goto error; + return ctx; error: @@ -210,6 +214,8 @@ iptablesContextFree(iptablesContext *ctx) iptRulesFree(ctx->forward_filter); if (ctx->nat_postrouting) iptRulesFree(ctx->nat_postrouting); + if (ctx->mangle_postrouting) + iptRulesFree(ctx->mangle_postrouting); VIR_FREE(ctx); } @@ -753,3 +759,68 @@ iptablesRemoveForwardMasquerade(iptablesContext *ctx, { return iptablesForwardMasquerade(ctx, network, physdev, REMOVE); } + + +static int +iptablesOutputFixUdpChecksum(iptablesContext *ctx, + const char *iface, + int port, + int action) +{ + char portstr[32]; + + snprintf(portstr, sizeof(portstr), "%d", port); + portstr[sizeof(portstr) - 1] = '\0'; + + return iptablesAddRemoveRule(ctx->mangle_postrouting, + action, + "--out-interface", iface, + "--protocol", "udp", + "--destination-port", portstr, + "--jump", "CHECKSUM", "--checksum-fill", + NULL); +} + +/** + * iptablesAddOutputFixUdpChecksum: + * @ctx: pointer to the IP table context + * @iface: the interface name + * @port: the UDP port to match + * + * Add an rule to the mangle table's POSTROUTING chain that fixes up the + * checksum of packets with the given destination @port. + * the given @iface interface for TCP packets. + * + * Returns 0 in case of success or an error code in case of error. + * (NB: if the system's iptables does not support checksum mangling, + * this will return an error, which should be ignored.) + */ + +int +iptablesAddOutputFixUdpChecksum(iptablesContext *ctx, + const char *iface, + int port) +{ + return iptablesOutputFixUdpChecksum(ctx, iface, port, ADD); +} + +/** + * iptablesRemoveOutputFixUdpChecksum: + * @ctx: pointer to the IP table context + * @iface: the interface name + * @port: the UDP port of the rule to remove + * + * Removes the checksum fixup rule that was previous added with + * iptablesAddOutputFixUdpChecksum. + * + * Returns 0 in case of success or an error code in case of error + * (again, if iptables doesn't support checksum fixup, this will + * return an error, which should be ignored) + */ +int +iptablesRemoveOutputFixUdpChecksum(iptablesContext *ctx, + const char *iface, + int port) +{ + return iptablesOutputFixUdpChecksum(ctx, iface, port, REMOVE); +} diff --git a/src/util/iptables.h b/src/util/iptables.h index 7d55a6d..5c2e553 100644 --- a/src/util/iptables.h +++ b/src/util/iptables.h @@ -89,5 +89,11 @@ int iptablesAddForwardMasquerade (iptablesContext *ctx, int iptablesRemoveForwardMasquerade (iptablesContext *ctx, const char *network, const char *physdev); +int iptablesAddOutputFixUdpChecksum (iptablesContext *ctx, + const char *iface, + int port); +int iptablesRemoveOutputFixUdpChecksum (iptablesContext *ctx, + const char *iface, + int port); #endif /* __QEMUD_IPTABLES_H__ */ -- 1.7.1.1

2 3

[libvirt] [PATCH] qemu: kill some dead stores
by Eric Blake 02 Aug '10

02 Aug '10

Spotted by clang. The qemuConnectMonitor one is an outright bug, the other two are cosmetic. * src/qemu/qemu_monitor.c (qemuMonitorClose): Kill dead store. * src/qemu/qemu_driver.c (qemudDomainSaveImageStartVM): Likewise. (qemuConnectMonitor): Don't lose error status. --- src/qemu/qemu_driver.c | 2 -- src/qemu/qemu_monitor.c | 4 +--- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 098f4da..57b8271 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1416,7 +1416,6 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) ret = qemuMonitorSetCapabilities(priv->mon); qemuDomainObjExitMonitorWithDriver(driver, vm); - ret = 0; error: if (ret < 0) qemuMonitorClose(priv->mon); @@ -6535,7 +6534,6 @@ qemudDomainSaveImageStartVM(virConnectPtr conn, wait_ret = qemudDomainSaveImageClose(fd, read_pid, &status); fd = -1; if (read_pid != -1) { - read_pid = -1; if (wait_ret == -1) { virReportSystemError(errno, _("failed to wait for process reading '%s'"), diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f1494ff..2366fdb 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -685,8 +685,6 @@ cleanup: void qemuMonitorClose(qemuMonitorPtr mon) { - int refs; - if (!mon) return; @@ -706,7 +704,7 @@ void qemuMonitorClose(qemuMonitorPtr mon) mon->closed = 1; } - if ((refs = qemuMonitorUnref(mon)) > 0) + if (qemuMonitorUnref(mon) > 0) qemuMonitorUnlock(mon); } -- 1.7.2

2 4

[libvirt] [PATCH] Check that virsh -d argument is numeric
by Daniel Veillard 02 Aug '10

02 Aug '10

Having been bitten one more time by the use of -d to pass the hypervisor URI instead of -c (confusion coming from CVS using -d to specify the root), I suggest to drop atoi and use the function with checking and error out with proper explanation instead of silently failing ! paphio:~/libvirt -> /usr/bin/virsh -d qemu+ssh://test2/system list Id Name State ---------------------------------- paphio:~/libvirt -> tools/virsh -d qemu+ssh://test2/system list error: option -d take a numeric argument paphio:~/libvirt -> tools/virsh -d 5 list command: "list " Id Name State ---------------------------------- paphio:~/libvirt -> Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 6

[libvirt] [PATCH] Fix the ACS checking in the PCI code.
by Chris Lalancette 02 Aug '10

02 Aug '10

When trying to assign a PCI device to a guest, we have to check that all bridges upstream of that device support ACS. That means that we have to find the parent bridge of the current device, check for ACS, then find the parent bridge of that device, check for ACS, etc. As it currently stands, the code to do this iterates through all PCI devices on the system, looking for a device that has a range of busses that included the current device's bus. That check is not restrictive enough, though. Depending on how we iterated through the list of PCI devices, we could first find the *topmost* bridge in the system; since it necessarily had a range of busses including the current device's bus, we would only ever check the topmost bridge, and not check any of the intermediate bridges. Note that this also caused a fairly serious bug in the secondary bus reset code, where we could erroneously find and reset the topmost bus instead of the inner bus. This patch changes pciGetParentDevice() so that it first checks if a bridge device's secondary bus exactly matches the bus of the device we are looking for. If it does, we've found the correct parent bridge and we are done. If it does not, then we check to see if this bridge device's busses *include* the bus of the device we care about. If so, we mark this bridge device as best, and go on. If we later find another bridge device whose busses include this device, but is more restrictive, then we free up the previous best and mark the new one as best. This algorithm ensures that in the normal case we find the direct parent, but in the case that the parent bridge secondary bus is not exactly the same as the device, we still find the correct bridge. This patch was tested by me on a 4-port NIC with a bridge without ACS (where assignment failed), a 4-port NIC with a bridge with ACS (where assignment succeeded), and a 2-port NIC with no bridges (where assignment succeeded). Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/util/pci.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 66 insertions(+), 12 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 26d55b8..f2890bd 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -283,6 +283,7 @@ pciIterDevices(pciIterPredicate predicate, DIR *dir; struct dirent *entry; int ret = 0; + int rc; *matched = NULL; @@ -322,11 +323,20 @@ pciIterDevices(pciIterPredicate predicate, break; } - if (predicate(dev, check, data)) { + rc = predicate(dev, check, data); + if (rc < 0) { + /* the predicate returned an error, bail */ + pciFreeDevice(check); + ret = -1; + break; + } + else if (rc == 1) { VIR_DEBUG("%s %s: iter matched on %s", dev->id, dev->name, check->name); *matched = check; + ret = 1; break; } + pciFreeDevice(check); } closedir(dir); @@ -510,10 +520,11 @@ pciBusContainsActiveDevices(pciDevice *dev, /* Is @check the parent of @dev ? */ static int -pciIsParent(pciDevice *dev, pciDevice *check, void *data ATTRIBUTE_UNUSED) +pciIsParent(pciDevice *dev, pciDevice *check, void *data) { uint16_t device_class; uint8_t header_type, secondary, subordinate; + pciDevice **best = data; if (dev->domain != check->domain) return 0; @@ -533,16 +544,54 @@ pciIsParent(pciDevice *dev, pciDevice *check, void *data ATTRIBUTE_UNUSED) VIR_DEBUG("%s %s: found parent device %s", dev->id, dev->name, check->name); - /* No, it's superman! */ - return (dev->bus >= secondary && dev->bus <= subordinate); + /* if the secondary bus exactly equals the device's bus, then we found + * the direct parent. No further work is necessary + */ + if (dev->bus == secondary) + return 1; + + /* otherwise, SRIOV allows VFs to be on different busses then their PFs. + * In this case, what we need to do is look for the "best" match; i.e. + * the most restrictive match that still satisfies all of the conditions. + */ + if (dev->bus > secondary && dev->bus <= subordinate) { + if (*best == NULL) { + *best = pciGetDevice(check->domain, check->bus, check->slot, + check->function); + if (*best == NULL) + return -1; + } + else { + /* OK, we had already recorded a previous "best" match for the + * parent. See if the current device is more restrictive than the + * best, and if so, make it the new best + */ + if (secondary > pciRead8(*best, PCI_SECONDARY_BUS)) { + pciFreeDevice(*best); + *best = pciGetDevice(check->domain, check->bus, check->slot, + check->function); + if (*best == NULL) + return -1; + } + } + } + + return 0; } -static pciDevice * -pciGetParentDevice(pciDevice *dev) +static int +pciGetParentDevice(pciDevice *dev, pciDevice **parent) { - pciDevice *parent = NULL; - pciIterDevices(pciIsParent, dev, &parent, NULL); - return parent; + pciDevice *best = NULL; + int ret; + + *parent = NULL; + ret = pciIterDevices(pciIsParent, dev, parent, &best); + if (ret == 1) + pciFreeDevice(best); + else if (ret == 0) + *parent = best; + return ret; } /* Secondary Bus Reset is our sledgehammer - it resets all @@ -570,7 +619,8 @@ pciTrySecondaryBusReset(pciDevice *dev, } /* Find the parent bus */ - parent = pciGetParentDevice(dev); + if (pciGetParentDevice(dev, &parent) < 0) + return -1; if (!parent) { pciReportError(VIR_ERR_NO_SUPPORT, _("Failed to find parent device for %s"), @@ -1377,7 +1427,8 @@ pciDeviceIsBehindSwitchLackingACS(pciDevice *dev) { pciDevice *parent; - parent = pciGetParentDevice(dev); + if (pciGetParentDevice(dev, &parent) < 0) + return -1; if (!parent) { /* if we have no parent, and this is the root bus, ACS doesn't come * into play since devices on the root bus can't P2P without going @@ -1400,6 +1451,7 @@ pciDeviceIsBehindSwitchLackingACS(pciDevice *dev) do { pciDevice *tmp; int acs; + int ret; acs = pciDeviceDownstreamLacksACS(parent); @@ -1412,8 +1464,10 @@ pciDeviceIsBehindSwitchLackingACS(pciDevice *dev) } tmp = parent; - parent = pciGetParentDevice(parent); + ret = pciGetParentDevice(parent, &parent); pciFreeDevice(tmp); + if (ret < 0) + return -1; } while (parent); return 0; -- 1.7.1.1

3 3

[libvirt] [PATCH] Free up memballoon def.
by Chris Lalancette 02 Aug '10

02 Aug '10

Forgetting to do this was causing a memory leak. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/conf/domain_conf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ca4bc6e..1ddea0a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -768,6 +768,8 @@ void virDomainDefFree(virDomainDefPtr def) virDomainWatchdogDefFree(def->watchdog); + virDomainMemballoonDefFree(def->memballoon); + virSecurityLabelDefFree(def); virCPUDefFree(def->cpu); -- 1.7.2

2 2

[libvirt] [PATCH] Don't put a semicolon on the end of a VIR_ENUM_IMPL.
by Chris Lalancette 02 Aug '10

02 Aug '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/conf/domain_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 04c417e..ca4bc6e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -99,7 +99,7 @@ VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, "none", "pci", "drive", - "virtio-serial"); + "virtio-serial") VIR_ENUM_IMPL(virDomainDisk, VIR_DOMAIN_DISK_TYPE_LAST, "block", -- 1.7.2

2 2

[libvirt] [PATCH] Fix a bogus warning when parsing <hostdev>
by Chris Lalancette 02 Aug '10

02 Aug '10

When parsing hostdev, the following message would be emitted: 10:17:19.052: error : virDomainHostdevDefParseXML:3748 : internal error unknown node alias However, alias is appropriately parsed in virDomainDeviceInfoParseXML anyway. Disable the error message in the initial XML parsing loop. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/conf/domain_conf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8721dd1..04c417e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3723,6 +3723,9 @@ virDomainHostdevDefParseXML(const xmlNodePtr node, goto error; } } else if (xmlStrEqual(cur->name, BAD_CAST "address")) { + /* address is parsed as part of virDomainDeviceInfoParseXML */ + } else if (xmlStrEqual(cur->name, BAD_CAST "alias")) { + /* alias is parsed as part of virDomainDeviceInfoParseXML */ } else { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("unknown node %s"), cur->name); -- 1.7.2

2 2

[libvirt] What should I do when I want to update the kvm for using libvirt in thel 5.4
by 姚远 02 Aug '10

02 Aug '10

My linux is rhel 5.4. In it, the version of kvm is 83 and the qemu is 0.9.1. Virt-manager and libvirt use "/usr/libexec/qemu-kvm" to manage VMs. Now, I want to use the higher version of kvm, so I download qemu-kvm-0.12.4.tar.gz. tar xvf qemu-kvm-0.12.4.tar.gz cd qemu-kvm-0.12.4 ./configure --prefix=/usr/ make make install Then, qemu-system-x86_86 is appeared, but the executalbe file "qemu-kvm" is not generated. Virt-manager an libvirt do not use "qemu-system-x86_86", they only use "qemu-kvm". What should I do when I want to update kvm for using libvirt in thel 5.4. Maybe I can compile a new "qemu-kvm" to substitute the old one. Thank you for your reply! Best wishes!

1 0

[libvirt] default storage pool will not start
by Albert Hopkins 01 Aug '10

01 Aug '10

Long ago I had a VM that used a qcow image that was in the default directory-based storage pool. Since then the VM and the image have been deleted. But now libvirt will not start without the image file: Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/host.py", line 586, in start_pool pool.start() File "/usr/share/virt-manager/virtManager/storagepool.py", line 67, in start self.pool.create(0) File "/usr/lib64/python2.6/site-packages/libvirt.py", line 1039, in create if ret == -1: raise libvirtError ('virStoragePoolCreate() failed', pool=self) libvirtError: cannot open volume '/var/lib/libvirt/images/gstable.qcow2': No such file or directory If I simply "touch" the file, then the pool starts. But I don't want it around. No other vm's reference this file. I've tried deleting and re-creating the pool. I've tried removing all the files in the pool, removing the directory, mkdir'ing the directory and then re-creating the pool, but it still will not start without that file. I've grepped /etc/libvirt for the existence of that filename but it doesn't exist. For the life of me I can't figure out where libvirt is getting this information from and why it thinks it needs this file.

2 3

[libvirt] [PATCH] Remove duplicate </p> from downloads.html.in
by Matthias Bolte 01 Aug '10

01 Aug '10

--- Just pushing this trivial patch. docs/downloads.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 04fd16c..6872272 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -69,7 +69,7 @@ <code>make install</code> </p> <p>At that point you may have to rerun ldconfig or a similar utility to - update your list of installed shared libs.</p> + update your list of installed shared libs. </p> <h2>Building from a source code checkout</h2> -- 1.7.0.4

1 0

[libvirt] OpenBSD crash after "shutdown vm"
by Armando 01 Aug '10

01 Aug '10

Good evening all, firstly I'd like to thank you for your wonderful job: it works nicely and simplifies a lot my life :) after saying that, I'd like to expose you a "bug" (not sure if I can call it this way): 1. scenario: as host I've configured a Ubuntu 10.04 with KVM + libvirt + LVM; I have also configured 4 virtual machines, three of wich are OpenBSDs and the other one is Linux (Fedora 13). 2. issue: when I issue a shutdown to a OpenBSD guest using "virsh shutdown vm" what happens is that the guest machine crashes. To be more precise it seems a kernel panic becuase the vnc session through KVM still works as the machine is running but every digit I issue does not appear on the server shell. Also the ssh sessions die; After having a chat in the #libvirt channel I tried doing this both with acpibtn enabled (on OpenBSD is the default behaviour) and also with acpibtn disabled (using the command "boot -c" and then "disable acpi" at boot time in the OpenBSD server). In both cases the server crashes At this point I have found an alternative way to automatically shut down the machine (using ssh) but it would be nice to understand way this happens. Is this a well-known issue? Is there a way to deeply debug it? Thanks a lot! 0x412E

1 0

[libvirt] [PATCH] Update ID after stopping a domain
by Matthias Bolte 30 Jul '10

30 Jul '10

--- src/esx/esx_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 2 ++ src/vbox/vbox_tmpl.c | 1 + src/xenapi/xenapi_driver.c | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 964a3a5..913420c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1620,6 +1620,7 @@ esxDomainDestroy(virDomainPtr domain) goto cleanup; } + domain->id = -1; result = 0; cleanup: diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 98381fb..c46f3a7 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -531,6 +531,7 @@ static int openvzDomainShutdown(virDomainPtr dom) { vm->def->id = -1; vm->state = VIR_DOMAIN_SHUTOFF; + dom->id = -1; ret = 0; cleanup: diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index e4afc5a..7143933 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3688,6 +3688,8 @@ phypDomainDestroy(virDomainPtr dom) if (phypUUIDTable_RemLpar(dom->conn, dom->id) == -1) goto err; + dom->id = -1; + VIR_FREE(cmd); VIR_FREE(ret); return 0; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 0a91c7f..31fec67 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1587,6 +1587,7 @@ static int vboxDomainDestroy(virDomainPtr dom) { } #endif VBOX_RELEASE(console); + dom->id = -1; ret = 0; } data->vboxSession->vtbl->Close(data->vboxSession); diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 2262cef..fb3c91d 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -830,6 +830,7 @@ xenapiDomainDestroy (virDomainPtr dom) return -1; } xen_vm_set_free(vms); + dom->id = -1; return 0; } if (vms) xen_vm_set_free(vms); -- 1.7.0.4

2 2

[libvirt] [PATCH] openvzDomainCreateWithFlags: set domain id to the correct value
by Jean-Baptiste Rouault 30 Jul '10

30 Jul '10

I'm not sure if it's ok or not to modify dom->id as I did here. Regards, Jean-Baptiste

2 2

[libvirt] [PATCH] storage: kill dead stores
by Eric Blake 30 Jul '10

30 Jul '10

Found by clang. Clang complained that virStorageBackendProbeTarget could dereference NULL if backingStoreFormat was NULL, but since all callers passed a valid pointer, I added attributes instead of null checks. * src/storage/storage_backend.c (virStorageBackendQEMUImgBackingFormat): Kill dead store. * src/storage/storage_backend_fs.c (virStorageBackendProbeTarget): Likewise. Skip null checks, by adding attributes. --- Thankfully, the null dereference scenario noted by clang was never triggered in the code, which is good since it was introduced as part of fixing a CVE. src/storage/storage_backend.c | 3 +-- src/storage/storage_backend_fs.c | 34 +++++++++++++++------------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index d989743..1fe7ba6 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -581,7 +581,6 @@ static int virStorageBackendQEMUImgBackingFormat(const char *qemuimg) int newstdout = -1; char *help = NULL; enum { MAX_HELP_OUTPUT_SIZE = 1024*8 }; - int len; char *start; char *end; char *tmp; @@ -591,7 +590,7 @@ static int virStorageBackendQEMUImgBackingFormat(const char *qemuimg) &child, -1, &newstdout, NULL, VIR_EXEC_CLEAR_CAPS) < 0) goto cleanup; - if ((len = virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help)) < 0) { + if (virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help) < 0) { virReportSystemError(errno, _("Unable to read '%s -h' output"), qemuimg); diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 0761bd8..b6b8fdd 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -48,7 +48,7 @@ #define VIR_FROM_THIS VIR_FROM_STORAGE -static int +static int ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) virStorageBackendProbeTarget(virStorageVolTargetPtr target, char **backingStore, int *backingStoreFormat, @@ -59,10 +59,8 @@ virStorageBackendProbeTarget(virStorageVolTargetPtr target, int fd, ret; virStorageFileMetadata meta; - if (backingStore) - *backingStore = NULL; - if (backingStoreFormat) - *backingStoreFormat = VIR_STORAGE_FILE_AUTO; + *backingStore = NULL; + *backingStoreFormat = VIR_STORAGE_FILE_AUTO; if (encryption) *encryption = NULL; @@ -75,7 +73,7 @@ virStorageBackendProbeTarget(virStorageVolTargetPtr target, allocation, capacity)) < 0) { close(fd); - return -1; + return ret; } memset(&meta, 0, sizeof(meta)); @@ -95,20 +93,19 @@ virStorageBackendProbeTarget(virStorageVolTargetPtr target, close(fd); if (meta.backingStore) { - if (backingStore) { - *backingStore = meta.backingStore; - meta.backingStore = NULL; - if (meta.backingStoreFormat == VIR_STORAGE_FILE_AUTO) { - if ((*backingStoreFormat = virStorageFileProbeFormat(*backingStore)) < 0) { - close(fd); - goto cleanup; - } - } else { - *backingStoreFormat = meta.backingStoreFormat; + *backingStore = meta.backingStore; + meta.backingStore = NULL; + if (meta.backingStoreFormat == VIR_STORAGE_FILE_AUTO) { + if ((*backingStoreFormat + = virStorageFileProbeFormat(*backingStore)) < 0) { + close(fd); + goto cleanup; } } else { - VIR_FREE(meta.backingStore); + *backingStoreFormat = meta.backingStoreFormat; } + } else { + VIR_FREE(meta.backingStore); } if (capacity && meta.capacity) @@ -139,8 +136,7 @@ virStorageBackendProbeTarget(virStorageVolTargetPtr target, return 0; cleanup: - if (backingStore) - VIR_FREE(*backingStore); + VIR_FREE(*backingStore); return -1; } -- 1.7.2

2 2

[libvirt] [PATCH] network: kill dead store
by Eric Blake 30 Jul '10

30 Jul '10

* src/network/bridge_driver.c (networkDefine): Kill dead store. --- src/network/bridge_driver.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b7ee880..217cdcc 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1490,14 +1490,13 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { virNetworkDefPtr def; virNetworkObjPtr network = NULL; virNetworkPtr ret = NULL; - int dupNet; networkDriverLock(driver); if (!(def = virNetworkDefParseString(xml))) goto cleanup; - if ((dupNet = virNetworkObjIsDuplicate(&driver->networks, def, 0)) < 0) + if (virNetworkObjIsDuplicate(&driver->networks, def, 0) < 0) goto cleanup; if (virNetworkSetBridgeName(&driver->networks, def, 1)) -- 1.7.2

2 2

[libvirt] [PATCH] xenapi: Update ID after starting a domain
by Matthias Bolte 30 Jul '10

30 Jul '10

--- src/xenapi/xenapi_driver.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index e385648..2262cef 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1459,6 +1459,7 @@ xenapiDomainCreateWithFlags (virDomainPtr dom, unsigned int flags) xen_vm_set *vms; xen_vm vm; xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + int64_t domid = -1; virCheckFlags(0, -1); @@ -1475,6 +1476,10 @@ xenapiDomainCreateWithFlags (virDomainPtr dom, unsigned int flags) xen_vm_set_free(vms); return -1; } + + xen_vm_get_domid(session, &domid, vm); + dom->id = domid; + xen_vm_set_free(vms); } else { if (vms) xen_vm_set_free(vms); -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Update ID after starting a domain
by Matthias Bolte 30 Jul '10

30 Jul '10

--- src/esx/esx_driver.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index eb64556..964a3a5 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2483,6 +2483,7 @@ esxDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) esxVI_ObjectContent *virtualMachine = NULL; esxVI_String *propertyNameList = NULL; esxVI_VirtualMachinePowerState powerState; + int id = -1; esxVI_ManagedObjectReference *task = NULL; esxVI_TaskInfoState taskInfoState; @@ -2497,8 +2498,8 @@ esxDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) esxVI_LookupVirtualMachineByUuidAndPrepareForTask (priv->primary, domain->uuid, propertyNameList, &virtualMachine, priv->autoAnswer) < 0 || - esxVI_GetVirtualMachinePowerState(virtualMachine, - &powerState) < 0) { + esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0 || + esxVI_GetVirtualMachineIdentity(virtualMachine, &id, NULL, NULL) < 0) { goto cleanup; } @@ -2521,6 +2522,7 @@ esxDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) goto cleanup; } + domain->id = id; result = 0; cleanup: -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix DMI uuid parsing.
by Chris Lalancette 30 Jul '10

30 Jul '10

valgrind was complaining that virUUIDParse was depending on an uninitialized value. Indeed it was; virSetHostUUIDStr() didn't initialize the dmiuuid buffer to 0's, meaning that anything after the string read from /sys was uninitialized. Clear out the dmiuuid buffer before use, and make sure to always leave a \0 at the end. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/util/uuid.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/uuid.c b/src/util/uuid.c index f188148..9cafc2a 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -286,7 +286,8 @@ virSetHostUUIDStr(const char *uuid) return EEXIST; if (!uuid) { - if (!getDMISystemUUID(dmiuuid, sizeof(dmiuuid))) { + memset(dmiuuid, 0, sizeof(dmiuuid)); + if (!getDMISystemUUID(dmiuuid, sizeof(dmiuuid) - 1)) { if (!virUUIDParse(dmiuuid, host_uuid)) return 0; } -- 1.7.1.1

2 2

[libvirt] [PATCH] Do not activate boot=on on devices when not using KVM
by Daniel Veillard 30 Jul '10

30 Jul '10

Basically the 'boot=on' boot selection device is something present in KVM but not in upstream QEmu, as a result if we boot a QEmu domain without KVM acceleration we must disable boot=on ... even if the front end kvm binary expose that capability in the help page. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] build: distribute libvirt_qemu.syms
by Eric Blake 30 Jul '10

30 Jul '10

* src/Makefile.am (EXTRA_DIST): Ensure 'make distcheck' and 'rpmbuild' can reproduce a build. * daemon/Makefile.am (DAEMON_SOURCES): Likewise. --- The recent qemu monitor commands were incomplete. daemon/Makefile.am | 4 ++++ src/Makefile.am | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 6769bab..963d64f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -10,6 +10,10 @@ DAEMON_SOURCES = \ remote_dispatch_table.h \ remote_dispatch_args.h \ remote_dispatch_ret.h \ + qemu_dispatch_prototypes.h \ + qemu_dispatch_table.h \ + qemu_dispatch_args.h \ + qemu_dispatch_ret.h \ ../src/remote/remote_protocol.c \ ../src/remote/qemu_protocol.c diff --git a/src/Makefile.am b/src/Makefile.am index 64d618b..a66eb2a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -162,7 +162,8 @@ REMOTE_DRIVER_SOURCES = \ remote/qemu_protocol.c \ remote/qemu_protocol.h -EXTRA_DIST += remote/remote_protocol.x remote/rpcgen_fix.pl +EXTRA_DIST += remote/remote_protocol.x remote/qemu_protocol.x \ + remote/rpcgen_fix.pl # Ensure that we don't change the struct or member names or member ordering # in remote_protocol.x The embedded perl below needs a few comments, and @@ -1074,6 +1075,7 @@ libvirt_qemu_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \ $(AM_LDFLAGS) libvirt_qemu_la_CFLAGS = $(AM_CFLAGS) libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) +EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE) libexec_PROGRAMS = -- 1.7.2

3 3

[libvirt] [PATCH] esx: Switch from name to number checks in the subdrivers
by Matthias Bolte 30 Jul '10

30 Jul '10

--- src/esx/esx_device_monitor.c | 2 +- src/esx/esx_interface_driver.c | 2 +- src/esx/esx_network_driver.c | 2 +- src/esx/esx_nwfilter_driver.c | 2 +- src/esx/esx_secret_driver.c | 2 +- src/esx/esx_storage_driver.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 5887ba0..d559f96 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -44,7 +44,7 @@ esxDeviceOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - if (STRNEQ(conn->driver->name, "ESX")) { + if (conn->driver->no != VIR_DRV_ESX) { return VIR_DRV_OPEN_DECLINED; } diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index d58e365..4bac3d5 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -44,7 +44,7 @@ esxInterfaceOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - if (STRNEQ(conn->driver->name, "ESX")) { + if (conn->driver->no != VIR_DRV_ESX) { return VIR_DRV_OPEN_DECLINED; } diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 52f5e65..a64bb8e 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -44,7 +44,7 @@ esxNetworkOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - if (STRNEQ(conn->driver->name, "ESX")) { + if (conn->driver->no != VIR_DRV_ESX) { return VIR_DRV_OPEN_DECLINED; } diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c index cc2e73b..a9d046d 100644 --- a/src/esx/esx_nwfilter_driver.c +++ b/src/esx/esx_nwfilter_driver.c @@ -43,7 +43,7 @@ esxNWFilterOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - if (STRNEQ(conn->driver->name, "ESX")) { + if (conn->driver->no != VIR_DRV_ESX) { return VIR_DRV_OPEN_DECLINED; } diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index 2d54b3f..1ae7ddc 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -42,7 +42,7 @@ static virDrvOpenStatus esxSecretOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - if (STRNEQ(conn->driver->name, "ESX")) { + if (conn->driver->no != VIR_DRV_ESX) { return VIR_DRV_OPEN_DECLINED; } diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 44d7d85..9f25e02 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -45,7 +45,7 @@ esxStorageOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - if (STRNEQ(conn->driver->name, "ESX")) { + if (conn->driver->no != VIR_DRV_ESX) { return VIR_DRV_OPEN_DECLINED; } -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Improve blocked task detection and fix race condition
by Matthias Bolte 30 Jul '10

30 Jul '10

esxVI_WaitForTaskCompletion can take a UUID to lookup the corresponding domain and check if the current task for it is blocked by a question. It calls another function to do this: esxVI_LookupAndHandleVirtualMachineQuestion looks up the VirtualMachine and checks for a question. If there is a question it calls esxVI_HandleVirtualMachineQuestion to handle it. If there was no question or it has been answered the call to esxVI_LookupAndHandleVirtualMachineQuestion returns 0. If any error occurred during the lookup and answering process -1 is returned. The problem with this is, that -1 is also returned when there was no error but the question could not be answered. So esxVI_WaitForTaskCompletion cannot distinguish between this two situations and reports that a question is blocking the task even when there was actually another problem. This inherent problem didn't surface until vSphere 4.1 when you try to define a new domain. The driver tries to lookup the domain that is just in the process of being registered. There seems to be some kind of race condition and the driver manages to issue a lookup command before the ESX server was able to register the domain. This used to work before. Due to the return value problem described above the driver reported a false error message in that case. To solve this esxVI_WaitForTaskCompletion now takes an additional occurrence parameter that describes whether or not to expect the domain to be existent. Also add a new parameter to esxVI_LookupAndHandleVirtualMachineQuestion that allows to distinguish if the call returned -1 because of an actual error or because the question could not be answered. --- src/esx/esx_driver.c | 17 ++++++++++++++- src/esx/esx_vi.c | 53 ++++++++++++++++++++++++++++++++++++------------- src/esx/esx_vi.h | 7 ++++- src/esx/esx_vmx.c | 4 +- 4 files changed, 61 insertions(+), 20 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f9affea..eb64556 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1409,6 +1409,7 @@ esxDomainSuspend(virDomainPtr domain) if (esxVI_SuspendVM_Task(priv->primary, virtualMachine->obj, &task) < 0 || esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -1462,6 +1463,7 @@ esxDomainResume(virDomainPtr domain) if (esxVI_PowerOnVM_Task(priv->primary, virtualMachine->obj, NULL, &task) < 0 || esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -1607,8 +1609,9 @@ esxDomainDestroy(virDomainPtr domain) } if (esxVI_PowerOffVM_Task(ctx, virtualMachine->obj, &task) < 0 || - esxVI_WaitForTaskCompletion(ctx, task, domain->uuid, priv->autoAnswer, - &taskInfoState) < 0) { + esxVI_WaitForTaskCompletion(ctx, task, domain->uuid, + esxVI_Occurrence_RequiredItem, + priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -1724,6 +1727,7 @@ esxDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) if (esxVI_ReconfigVM_Task(priv->primary, virtualMachine->obj, spec, &task) < 0 || esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -1775,6 +1779,7 @@ esxDomainSetMemory(virDomainPtr domain, unsigned long memory) if (esxVI_ReconfigVM_Task(priv->primary, virtualMachine->obj, spec, &task) < 0 || esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -2104,6 +2109,7 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) if (esxVI_ReconfigVM_Task(priv->primary, virtualMachine->obj, spec, &task) < 0 || esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -2505,6 +2511,7 @@ esxDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) if (esxVI_PowerOnVM_Task(priv->primary, virtualMachine->obj, NULL, &task) < 0 || esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -2702,6 +2709,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) datastoreRelatedPath, NULL, esxVI_Boolean_False, resourcePool, hostSystem->obj, &task) < 0 || esxVI_WaitForTaskCompletion(priv->host, task, def->uuid, + esxVI_Occurrence_OptionalItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -3069,6 +3077,7 @@ esxDomainSetSchedulerParameters(virDomainPtr domain, if (esxVI_ReconfigVM_Task(priv->primary, virtualMachine->obj, spec, &task) < 0 || esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -3223,6 +3232,7 @@ esxDomainMigratePerform(virDomainPtr domain, esxVI_VirtualMachinePowerState_Undefined, &task) < 0 || esxVI_WaitForTaskCompletion(priv->vCenter, task, domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -3465,6 +3475,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, esxVI_Boolean_True, esxVI_Boolean_False, &task) < 0 || esxVI_WaitForTaskCompletion(priv->primary, task, domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -3721,6 +3732,7 @@ esxDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, unsigned int flags) if (esxVI_RevertToSnapshot_Task(priv->primary, snapshotTree->snapshot, NULL, &task) < 0 || esxVI_WaitForTaskCompletion(priv->primary, task, snapshot->domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } @@ -3775,6 +3787,7 @@ esxDomainSnapshotDelete(virDomainSnapshotPtr snapshot, unsigned int flags) if (esxVI_RemoveSnapshot_Task(priv->primary, snapshotTree->snapshot, removeChildren, &task) < 0 || esxVI_WaitForTaskCompletion(priv->primary, task, snapshot->domain->uuid, + esxVI_Occurrence_RequiredItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 69ba7a9..98b8bcd 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2217,6 +2217,7 @@ esxVI_LookupVirtualMachineByUuidAndPrepareForTask esxVI_String *completePropertyNameList = NULL; esxVI_VirtualMachineQuestionInfo *questionInfo = NULL; esxVI_TaskInfo *pendingTaskInfoList = NULL; + esxVI_Boolean blocked = esxVI_Boolean_Undefined; if (esxVI_String_DeepCopyList(&completePropertyNameList, propertyNameList) < 0 || @@ -2235,7 +2236,8 @@ esxVI_LookupVirtualMachineByUuidAndPrepareForTask if (questionInfo != NULL && esxVI_HandleVirtualMachineQuestion(ctx, (*virtualMachine)->obj, - questionInfo, autoAnswer) < 0) { + questionInfo, autoAnswer, + &blocked) < 0) { goto cleanup; } @@ -2528,7 +2530,9 @@ esxVI_LookupPendingTaskInfoListByVirtualMachine int esxVI_LookupAndHandleVirtualMachineQuestion(esxVI_Context *ctx, const unsigned char *uuid, - esxVI_Boolean autoAnswer) + esxVI_Occurrence occurrence, + esxVI_Boolean autoAnswer, + esxVI_Boolean *blocked) { int result = -1; esxVI_ObjectContent *virtualMachine = NULL; @@ -2538,17 +2542,22 @@ esxVI_LookupAndHandleVirtualMachineQuestion(esxVI_Context *ctx, if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.question") < 0 || esxVI_LookupVirtualMachineByUuid(ctx, uuid, propertyNameList, - &virtualMachine, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_GetVirtualMachineQuestionInfo(virtualMachine, - &questionInfo) < 0) { + &virtualMachine, occurrence) < 0) { goto cleanup; } - if (questionInfo != NULL && - esxVI_HandleVirtualMachineQuestion(ctx, virtualMachine->obj, - questionInfo, autoAnswer) < 0) { - goto cleanup; + if (virtualMachine != NULL) { + if (esxVI_GetVirtualMachineQuestionInfo(virtualMachine, + &questionInfo) < 0) { + goto cleanup; + } + + if (questionInfo != NULL && + esxVI_HandleVirtualMachineQuestion(ctx, virtualMachine->obj, + questionInfo, autoAnswer, + blocked) < 0) { + goto cleanup; + } } result = 0; @@ -2700,7 +2709,7 @@ int esxVI_HandleVirtualMachineQuestion (esxVI_Context *ctx, esxVI_ManagedObjectReference *virtualMachine, esxVI_VirtualMachineQuestionInfo *questionInfo, - esxVI_Boolean autoAnswer) + esxVI_Boolean autoAnswer, esxVI_Boolean *blocked) { int result = -1; esxVI_ElementDescription *elementDescription = NULL; @@ -2709,6 +2718,13 @@ esxVI_HandleVirtualMachineQuestion int answerIndex = 0; char *possibleAnswers = NULL; + if (blocked == NULL || *blocked != esxVI_Boolean_Undefined) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + *blocked = esxVI_Boolean_False; + if (questionInfo->choice->choiceInfo != NULL) { for (elementDescription = questionInfo->choice->choiceInfo; elementDescription != NULL; @@ -2742,6 +2758,8 @@ esxVI_HandleVirtualMachineQuestion _("Pending question blocks virtual machine execution, " "question is '%s', no possible answers"), questionInfo->text); + + *blocked = esxVI_Boolean_True; goto cleanup; } else if (answerChoice == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, @@ -2749,6 +2767,8 @@ esxVI_HandleVirtualMachineQuestion "question is '%s', possible answers are %s, but no " "default answer is specified"), questionInfo->text, possibleAnswers); + + *blocked = esxVI_Boolean_True; goto cleanup; } @@ -2774,6 +2794,7 @@ esxVI_HandleVirtualMachineQuestion questionInfo->text); } + *blocked = esxVI_Boolean_True; goto cleanup; } @@ -2795,6 +2816,7 @@ int esxVI_WaitForTaskCompletion(esxVI_Context *ctx, esxVI_ManagedObjectReference *task, const unsigned char *virtualMachineUuid, + esxVI_Occurrence virtualMachineOccurrence, esxVI_Boolean autoAnswer, esxVI_TaskInfoState *finalState) { @@ -2810,6 +2832,7 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, esxVI_PropertyChange *propertyChange = NULL; esxVI_AnyType *propertyValue = NULL; esxVI_TaskInfoState state = esxVI_TaskInfoState_Undefined; + esxVI_Boolean blocked = esxVI_Boolean_Undefined; esxVI_TaskInfo *taskInfo = NULL; version = strdup(""); @@ -2850,7 +2873,8 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, if (virtualMachineUuid != NULL) { if (esxVI_LookupAndHandleVirtualMachineQuestion - (ctx, virtualMachineUuid, autoAnswer) < 0) { + (ctx, virtualMachineUuid, virtualMachineOccurrence, + autoAnswer, &blocked) < 0) { /* * FIXME: Disable error reporting here, so possible errors from * esxVI_LookupTaskInfoByTask() and esxVI_CancelTask() @@ -2861,12 +2885,13 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, } if (taskInfo->cancelable == esxVI_Boolean_True) { - if (esxVI_CancelTask(ctx, task) < 0) { + if (esxVI_CancelTask(ctx, task) < 0 && + blocked == esxVI_Boolean_True) { VIR_ERROR0(_("Cancelable task is blocked by an " "unanswered question but cancelation " "failed")); } - } else { + } else if (blocked == esxVI_Boolean_True) { VIR_ERROR0(_("Non-cancelable task is blocked by an " "unanswered question")); } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 9eb5094..ef9c6d9 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -367,7 +367,9 @@ int esxVI_LookupPendingTaskInfoListByVirtualMachine int esxVI_LookupAndHandleVirtualMachineQuestion(esxVI_Context *ctx, const unsigned char *uuid, - esxVI_Boolean autoAnswer); + esxVI_Occurrence occurrence, + esxVI_Boolean autoAnswer, + esxVI_Boolean *blocked); int esxVI_LookupRootSnapshotTreeList (esxVI_Context *ctx, const unsigned char *virtualMachineUuid, @@ -382,11 +384,12 @@ int esxVI_HandleVirtualMachineQuestion (esxVI_Context *ctx, esxVI_ManagedObjectReference *virtualMachine, esxVI_VirtualMachineQuestionInfo *questionInfo, - esxVI_Boolean autoAnswer); + esxVI_Boolean autoAnswer, esxVI_Boolean *blocked); int esxVI_WaitForTaskCompletion(esxVI_Context *ctx, esxVI_ManagedObjectReference *task, const unsigned char *virtualMachineUuid, + esxVI_Occurrence virtualMachineOccurrence, esxVI_Boolean autoAnswer, esxVI_TaskInfoState *finalState); diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c63b159..ee7afb2 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -811,8 +811,8 @@ esxVMX_AutodetectSCSIControllerModel(esxVI_Context *ctx, /* Search datastore for file */ if (esxVI_SearchDatastore_Task(ctx, hostDatastoreBrowser, datastorePath, searchSpec, &task) < 0 || - esxVI_WaitForTaskCompletion(ctx, task, NULL, esxVI_Boolean_False, - &taskInfoState) < 0) { + esxVI_WaitForTaskCompletion(ctx, task, NULL, esxVI_Occurrence_None, + esxVI_Boolean_False, &taskInfoState) < 0) { goto cleanup; } -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Fix freeing of heterogeneous lists
by Matthias Bolte 30 Jul '10

30 Jul '10

Always call the free function of the base type. The base type function then dynamically dispatches the call to the free function for the actual type. --- src/esx/esx_vi_generator.py | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 82bc9b6..44c3493 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -684,7 +684,10 @@ class Object: source += "{\n" if self.features & Object.FEATURE__LIST: - source += " esxVI_%s_Free(&item->_next);\n\n" % self.name + if self.extends is not None: + source += " esxVI_%s_Free((esxVI_%s **)&item->_next);\n\n" % (self.extends, self.extends) + else: + source += " esxVI_%s_Free(&item->_next);\n\n" % self.name source += self.generate_free_code() @@ -701,7 +704,10 @@ class Object: source += "{\n" if self.features & Object.FEATURE__LIST: - source += " esxVI_%s_Free(&item->_next);\n\n" % self.name + if self.extends is not None: + source += " esxVI_%s_Free((esxVI_%s **)&item->_next);\n\n" % (self.extends, self.extends) + else: + source += " esxVI_%s_Free(&item->_next);\n\n" % self.name source += self.generate_free_code() @@ -1126,11 +1132,11 @@ additional_object_features = { "DatastoreInfo" : Object.FEATURE__AN "FileInfo" : Object.FEATURE__DYNAMIC_CAST, "FileQuery" : Object.FEATURE__DYNAMIC_CAST, "HostCpuIdInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__LIST, - "HostDatastoreBrowserSearchResults" : Object.FEATURE__ANY_TYPE, + "HostDatastoreBrowserSearchResults" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, "ObjectContent" : Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST, "PerfCounterInfo" : Object.FEATURE__LIST, - "PerfEntityMetric" : Object.FEATURE__LIST | Object.FEATURE__DYNAMIC_CAST, + "PerfEntityMetric" : Object.FEATURE__LIST | Object.FEATURE__DYNAMIC_CAST, "PerfQuerySpec" : Object.FEATURE__LIST, "PerfMetricIntSeries" : Object.FEATURE__DYNAMIC_CAST, "PropertyFilterSpec" : Object.FEATURE__LIST, -- 1.7.0.4

2 2

[libvirt] [PATCH 0/2] build: fix bugs detected by newer gcc
by Eric Blake 30 Jul '10

30 Jul '10

Rawhide's gcc 4.5.0 got smarter in relation to Fedora 13's gcc 4.4.4, and exposed a real bug (introduced by commit ed9c14a7 this January) as well as extra noise that is easy enough to silence. The new warnings looked like: esx/esx_vi_types.c:1231:1: warning: logical 'or' of collectively exhaustive tests is always true [-Wlogical-op] And the esx_vi_types.c case is proof why it is a bad idea to ever stick -Werror in a spec file - upgrade the compiler, and something that previously built silently can now fail to build; in contrast, using -Werror during development is great as it forces you to think about the issue, and in the case of xen, fix a real bug. Eric Blake (2): xen: fix logic bug esx: silence spurious compiler warning src/esx/esx_vi_types.c | 6 ++++-- src/xen/xend_internal.c | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) -- 1.7.2

3 7

[libvirt] "make rpm" failure?
by Justin Clift 30 Jul '10

30 Jul '10

Hi Eric, Have you tried a "make rpm" with libvirt git head since your recent "build: fix VPATH builds" commit? commit 4018a026b2b4b50bfc5e4c35dabb828ebf6cc3f7 Author: Eric Blake <eblake(a)redhat.com> Date: Mon Jul 26 10:38:30 2010 -0600 build: fix VPATH builds After the recent libvirt-qemu library addition, VPATH builds fail ... The commit comment indicates it should fix an error where ld can't find "libvirt_qemu.syms". I'm still getting that the error though: $ make rpm ... CCLD libvirt-qemu.la /usr/bin/ld: cannot open linker script file ./libvirt_qemu.syms: No such file or directory collect2: ld returned 1 exit status make[4]: *** [libvirt-qemu.la] Error 1 make[4]: *** Waiting for unfinished jobs.... make[4]: Leaving directory `/home/jc/rpmbuild/BUILD/libvirt-0.8.2/src' make[3]: *** [all] Error 2 make[3]: Leaving directory `/home/jc/rpmbuild/BUILD/libvirt-0.8.2/src' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/home/jc/rpmbuild/BUILD/libvirt-0.8.2' make[1]: *** [all] Error 2 make[1]: Leaving directory `/home/jc/rpmbuild/BUILD/libvirt-0.8.2' error: Bad exit status from /var/tmp/rpm-tmp.xiUlH6 (%build) In configure.ac, where it's defined as: LIBVIRT_QEMU_SYMBOL_FILE='$(srcdir)/libvirt_qemu.syms' The $srcdir seems to be getting turned into a ".", so that this happens: [jc@host1 libvirt]$ grep -r "libvirt_qemu.syms" . ./gnulib/lib/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./gnulib/tests/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./src/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./tests/xencapsdata/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./tests/xml2sexprdata/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./tests/sexpr2xmldata/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./tests/xmconfigdata/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./tests/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./tests/confdata/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./include/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./include/libvirt/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./proxy/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms ./python/tests/Makefile:LIBVIRT_QEMU_SYMBOL_FILE = ./libvirt_qemu.syms It looks like the $srcdir needs to be resolved to an absolute path, rather than a relative one, but I have no idea how in autoconf stuff. Any ideas off the top of your head? :) Regards and best wishes, Justin Clift

2 1

[libvirt] Failed when client connects to the hypervisor running on Server using TLS
by Xiaoqiang Hu 30 Jul '10

30 Jul '10

Hi all, Failed when client connects to the hypervisor running on Server using TLS and the details can be seen as follows: I Test Procedures: On server (10.66.92.154) 1. Set up a Certificate Authority (CA) 1.1 # certtool --generate-privkey > cakey.pem 1.2 self-sign cakey.pem by creating a file with the signature details called ca.info containing: cn=10.66.92.154 ca cert_signing_key 1.3 # certtool --generate-self-signed --load-privkey cakey.pem --template ca.info --outfile cacert.pem 2. Create server certificates 2.1 certtool --generate-privkey > serverkey.pem 2.2 sign that key with the CA's private key by first creating a template file called server.info organization=Red Hat cn=10.66.92.154 tls_www_server encryption_key signing_key 2.3 # certtool --generate-certificate --load-privkey serverkey.pem --load-ca-certificate cacert.pem \ --load-ca-privkey cakey.pem --template server.info --outfile servercert.pem 3. Copy CA key and server key to correct directory 3.1 # cp cakey.pem cacert.pem /etc/pki/CA 3.2 # mkdir -p /etc/pki/libvirt/private 3.3 # cp serverkey.pem /etc/pki/libvirt/private 3.4 # cp servercert.pem /etc/pki/libvirt 4. Copy CA key to client(10.66.93.205) into correct directory 4.1 # scp cakey.pem cacert.pem root@10.66.93.205:/etc/pki/CA 5. Turn on libvird monitor listening in /etc/sysconfig/libvirtd -- uncomment LIBVIRTD_ARGS="--listen" 6. Edit /etc/libvirt/libvirtd.conf -- enbale listen_tls = 1 7. # service libvirtd restart 8. # service iptables stop On client (10.66.93.205) 9. Create client certificates 9.1 # certtool --generate-privkey > clientkey.pem 9.2 Act as CA and sign the certificate. Create client.info containing: 9.1 # certtool --generate-privkey > clientkey.pem 9.2 Act as CA and sign the certificate. Create client.info containing: country=GB state=London locality=London organization=Red Hat cn=10.66.93.205 tls_www_client encryption_key signing_key 9.3 # certtool --generate-certificate --load-privkey clientkey.pem --load-ca-certificate /etc/pki/CA/cacert.pem \ --load-ca-privkey /etc/pki/CA/cakey.pem --template client.info --outfile clientcert.pem 10. Copy client key to correct directory 10.1 # mkdir -p /etc/pki/libvirt/private 10.2 # cp clientkey.pem /etc/pki/libvirt/private 10.3 # cp clientcert.pem /etc/pki/libvirt/ 11. Conect to server hypervisor # virsh -c qemu+tls://10.66.92.154/system II Test Result: [root@dhcp-93-205 images]# virsh -c qemu+tls://10.66.92.154/system error: server verification (of our certificate or IP address) failed error: failed to connect to the hypervisor Note: if I Step 9 as above on server and then the client can connect to the hypervisor running on Server using TLS successfully. Regards! Johnson

1 0

[libvirt] A error about live migration with --copy-storage-all
by 姚远 30 Jul '10

30 Jul '10

In fedora-13, libvirt is libvirt-0.8.2 and qemu is qemu-kvm-0.12.3. In virsh , the command of "migrate --live fedora-13 qemu+ssh:// 10.1.10.54/system" is going well. but when I use the command of "migrate --live --copy-storage-all fedora-13 qemu+ssh://10.1.10.54/system", it show the error: internal errorqemu: could not open disk image /home/images/fedora-13.img: No such file or directory qemu: could not open disk image /home/images/fedora-13.img: No such file or directory "10.1.10.54" is the ip of destination, and fedora-13 is my VM. I don't know why. My VM "fedora-13" can going well with "virsh start fedora-13" by "/usr/bin/qemu-kvm". Who do live migration with "--copy-storage-all" successfully can help me. What is "--copy-storage-inc migration with non-shared storage with incremental copy (same base image shared between source and destination)"? do that means I also need a shared storage? The document of this I can find out is too less. thank you!

1 0

[libvirt] mingw build regression
by Eric Blake 29 Jul '10

29 Jul '10

Using mingw32-portablexdr-4.0.11, I'm failing when cross-compiling from F13 to mingw (during ./autobuild.sh) with: remote/remote_protocol.c: In function 'xdr_remote_message_header': remote/remote_protocol.c:3628: error: implicit declaration of function 'IXDR_PUT_U_INT32' [-Wimplicit-function-declaration] remote/remote_protocol.c:3628: error: nested extern declaration of 'IXDR_PUT_U_INT32' [-Wnested-externs] I know a newer rpm is available with portablexdr 4.9.x, but haven't tried installing it yet. At any rate, it looks like the recent qemu monitor stuff caused rpcgen to generate enough code to pull in a new conversion that we hadn't previously used, but with a glibc-specific spelling. Hopefully a simple #ifndef/#define of IXDR_PUT_U_INT32 will solve the problem (at any rate, I recall seeing patches in the past for some other translation helpers for other xdr code), if someone wants to tackle this before me. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCHv4] build: restore operation of bit-rotted 'make cov'
by Eric Blake 29 Jul '10

29 Jul '10

'./autobuild.sh' with lcov installed discovered that our coverage support has been bit-rotting for a while. This restores it back to a successful state, although I have not yet spent any time looking through the resulting files to look for low-hanging fruit in the unit test coverage front. * configure.ac: Clear COMPILER_FLAGS at right place. * Makefile.am (cov): Newer genhtml no longer likes plain -s. * m4/compiler-flags.m4 (gl_COMPILER_FLAGS): Don't AC_SUBST COMPILER_FLAGS; it is a shell variable for use in configure only. * src/Makefile.am (AM_CFLAGS, AM_LDFLAGS): New variables, to make it easier to provide global flag additions. Use throughout, to uniformly apply coverage flags. * .gitignore: Globally ignore gcov output. * daemon/.gitignore: Simplify. * src/.gitignore: Likewise. * tests/.gitignore: Likewise. --- v3 had an ACK at: https://www.redhat.com/archives/libvir-list/2010-June/msg00660.html but I never applied it because it was part of a larger series that had not been completed. I'm now at the point where this is easy enough to include in 0.8.3, while leaving the docs VPATH fixups for post release, but it has changed enough to need another ACK before I can push. Changes from v3: rebase to present status (several conflicts resolved in src/Makefile.am) fix 'cov' rule in Makefile.am to allow VPATH usage .gitignore | 3 + Makefile.am | 10 +++- configure.ac | 1 + daemon/.gitignore | 2 - m4/compiler-flags.m4 | 1 - src/.gitignore | 3 - src/Makefile.am | 112 +++++++++++++++++++++++++++----------------------- tests/.gitignore | 2 - 8 files changed, 71 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 39ed671..c62e885 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ *.#*# *.a *.exe +*.gcda +*.gcno +*.gcov *.o *.orig *.rej diff --git a/Makefile.am b/Makefile.am index a6af20f..c5d278b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,10 +68,14 @@ tests: cov: clean-cov mkdir $(top_builddir)/coverage - $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp -d $(top_srcdir)/src -d $(top_srcdir)/daemon -d $(top_srcdir)/tests - $(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp -o $(top_builddir)/coverage/libvirt.info *usr* + $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \ + -d $(top_builddir)/src -d $(top_builddir)/daemon \ + -d $(top_builddir)/tests + $(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \ + -o $(top_builddir)/coverage/libvirt.info rm $(top_builddir)/coverage/libvirt.info.tmp - $(GENHTML) -s -t "libvirt" -o $(top_builddir)/coverage --legend $(top_builddir)/coverage/libvirt.info + $(GENHTML) --show-details -t "libvirt" -o $(top_builddir)/coverage \ + --legend $(top_builddir)/coverage/libvirt.info clean-cov: rm -rf $(top_builddir)/coverage diff --git a/configure.ac b/configure.ac index 7bc0e79..70432c1 100644 --- a/configure.ac +++ b/configure.ac @@ -1752,6 +1752,7 @@ AC_ARG_ENABLE([test-coverage], enable_coverage=$enableval if test "${enable_coverage}" = yes; then + COMPILER_FLAGS= gl_COMPILER_FLAGS(-fprofile-arcs) gl_COMPILER_FLAGS(-ftest-coverage) AC_SUBST([COVERAGE_CFLAGS], [$COMPILER_FLAGS]) diff --git a/daemon/.gitignore b/daemon/.gitignore index 4e6123e..4475b6d 100644 --- a/daemon/.gitignore +++ b/daemon/.gitignore @@ -1,5 +1,3 @@ -*.gcda -*.gcno *.la *.lo .deps diff --git a/m4/compiler-flags.m4 b/m4/compiler-flags.m4 index 628bd1f..6db4816 100644 --- a/m4/compiler-flags.m4 +++ b/m4/compiler-flags.m4 @@ -23,7 +23,6 @@ AC_DEFUN([gl_COMPILER_FLAGS], [AC_MSG_CHECKING(whether compiler accepts $1) - AC_SUBST(COMPILER_FLAGS) ac_save_CFLAGS="$CFLAGS" dnl Some flags are dependant, so we set all previously checked dnl flags when testing. Except for -Werror which we have to diff --git a/src/.gitignore b/src/.gitignore index d24a87d..5d114c9 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -6,9 +6,6 @@ Makefile.in *.loT *.la *.exe -*.gcda -*.gcno -*.gcov *.cov libvirt_parthelper libvirt_lxc diff --git a/src/Makefile.am b/src/Makefile.am index f71f72c..940bd33 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,9 @@ INCLUDES = \ -DIN_LIBVIRT \ $(WIN32_EXTRA_CFLAGS) +AM_CFLAGS = $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(COVERAGE_LDFLAGS) + EXTRA_DIST = $(conf_DATA) BUILT_SOURCES = @@ -420,20 +423,21 @@ libvirt_la_LIBADD = $(libvirt_la_BUILT_LIBADD) libvirt_la_BUILT_LIBADD = libvirt_util.la libvirt_util_la_SOURCES = \ $(UTIL_SOURCES) -libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) +libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ + $(AM_CFLAGS) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) $(LIB_PTHREAD) noinst_LTLIBRARIES += libvirt_conf.la libvirt_la_BUILT_LIBADD += libvirt_conf.la libvirt_conf_la_SOURCES = $(CONF_SOURCES) -libvirt_conf_la_CFLAGS = -libvirt_conf_la_LDFLAGS = +libvirt_conf_la_CFLAGS = $(AM_CFLAGS) +libvirt_conf_la_LDFLAGS = $(AM_LDFLAGS) noinst_LTLIBRARIES += libvirt_cpu.la libvirt_la_BUILT_LIBADD += libvirt_cpu.la libvirt_cpu_la_CFLAGS = \ - -I@top_srcdir@/src/conf + -I@top_srcdir@/src/conf $(AM_CFLAGS) libvirt_cpu_la_SOURCES = $(CPU_SOURCES) @@ -442,7 +446,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver.la libvirt_driver_la_SOURCES = $(DRIVER_SOURCES) libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) \ - -I@top_srcdir@/src/conf + -I@top_srcdir@/src/conf $(AM_CFLAGS) libvirt_driver_la_LIBADD = $(NUMACTL_LIBS) $(GNUTLS_LIBS) USED_SYM_FILES = libvirt_private.syms @@ -455,9 +459,9 @@ noinst_LTLIBRARIES += libvirt_driver_test.la libvirt_la_BUILT_LIBADD += libvirt_driver_test.la endif libvirt_driver_test_la_CFLAGS = \ - -I@top_srcdir@/src/conf + -I@top_srcdir@/src/conf $(AM_CFLAGS) if WITH_DRIVER_MODULES -libvirt_driver_test_la_LDFLAGS = -module -avoid-version +libvirt_driver_test_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) endif libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES) endif @@ -472,8 +476,9 @@ endif libvirt_driver_remote_la_CFLAGS = \ $(GNUTLS_CFLAGS) \ $(SASL_CFLAGS) \ - -I@top_srcdir@/src/conf -libvirt_driver_remote_la_LDFLAGS = + -I@top_srcdir@/src/conf \ + $(AM_CFLAGS) +libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_remote_la_LIBADD = $(GNUTLS_LIBS) $(SASL_LIBS) if WITH_DRIVER_MODULES libvirt_driver_remote_la_LDFLAGS += -module -avoid-version @@ -553,8 +558,9 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_xen.la endif libvirt_driver_xen_la_CFLAGS = \ $(XEN_CFLAGS) \ - -I@top_srcdir@/src/conf -libvirt_driver_xen_la_LDFLAGS = + -I@top_srcdir@/src/conf \ + $(AM_CFLAGS) +libvirt_driver_xen_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_xen_la_LIBADD = $(XEN_LIBS) if WITH_DRIVER_MODULES libvirt_driver_xen_la_LDFLAGS += -module -avoid-version @@ -571,7 +577,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_phyp.la endif libvirt_driver_phyp_la_LIBADD = $(LIBSSH2_LIBS) libvirt_driver_phyp_la_CFLAGS = $(LIBSSH2_CFLAGS) \ - -I@top_srcdir@/src/conf + -I@top_srcdir@/src/conf $(AM_CFLAGS) libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES) endif @@ -583,9 +589,9 @@ noinst_LTLIBRARIES += libvirt_driver_openvz.la libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la endif libvirt_driver_openvz_la_CFLAGS = \ - -I@top_srcdir@/src/conf + -I@top_srcdir@/src/conf $(AM_CFLAGS) if WITH_DRIVER_MODULES -libvirt_driver_openvz_la_LDFLAGS = -module -avoid-version +libvirt_driver_openvz_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) endif libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES) endif @@ -598,9 +604,9 @@ noinst_LTLIBRARIES += libvirt_driver_vbox.la libvirt_la_BUILT_LIBADD += libvirt_driver_vbox.la endif libvirt_driver_vbox_la_CFLAGS = \ - -I@top_srcdir@/src/conf + -I@top_srcdir@/src/conf $(AM_CFLAGS) if WITH_DRIVER_MODULES -libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version +libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) endif libvirt_driver_vbox_la_LIBADD = $(DLOPEN_LIBS) libvirt_driver_vbox_la_SOURCES = $(VBOX_DRIVER_SOURCES) @@ -614,8 +620,8 @@ noinst_LTLIBRARIES += libvirt_driver_xenapi.la libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la endif libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(LIBCURL_CFLAGS) \ - -I@top_srcdir@/src/conf -libvirt_driver_xenapi_la_LDFLAGS = + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(LIBCURL_LIBS) if WITH_DRIVER_MODULES libvirt_driver_xenapi_la_LDFLAGS += -module -avoid-version @@ -632,8 +638,8 @@ noinst_LTLIBRARIES += libvirt_driver_qemu.la #libvirt_la_BUILT_LIBADD += libvirt_driver_qemu.la endif libvirt_driver_qemu_la_CFLAGS = $(NUMACTL_CFLAGS) \ - -I@top_srcdir@/src/conf -libvirt_driver_qemu_la_LDFLAGS = + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_qemu_la_LIBADD = $(NUMACTL_LIBS) if WITH_DRIVER_MODULES libvirt_driver_qemu_la_LDFLAGS += -module -avoid-version @@ -659,9 +665,9 @@ noinst_LTLIBRARIES += libvirt_driver_lxc.la #libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la endif libvirt_driver_lxc_la_CFLAGS = \ - -I@top_srcdir@/src/conf + -I@top_srcdir@/src/conf $(AM_CFLAGS) if WITH_DRIVER_MODULES -libvirt_driver_lxc_la_LDFLAGS = -module -avoid-version +libvirt_driver_lxc_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) endif libvirt_driver_lxc_la_SOURCES = $(LXC_DRIVER_SOURCES) @@ -682,8 +688,8 @@ noinst_LTLIBRARIES += libvirt_driver_uml.la #libvirt_la_BUILT_LIBADD += libvirt_driver_uml.la endif libvirt_driver_uml_la_CFLAGS = $(NUMACTL_CFLAGS) \ - -I@top_srcdir@/src/conf -libvirt_driver_uml_la_LDFLAGS = + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_uml_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_uml_la_LIBADD = $(NUMACTL_LIBS) if WITH_DRIVER_MODULES libvirt_driver_uml_la_LDFLAGS += -module -avoid-version @@ -700,8 +706,8 @@ noinst_LTLIBRARIES += libvirt_driver_one.la #libvirt_la_BUILT_LIBADD += libvirt_driver_one.la endif libvirt_driver_one_la_CFLAGS = $(XMLRPC_CFLAGS) \ - -I@top_srcdir@/src/conf -libvirt_driver_one_la_LDFLAGS = + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_one_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_one_la_LIBADD = $(XMLRPC_LIBS) #libvirt_driver_one_la_CFLAGS = "-DWITH_ONE" if WITH_DRIVER_MODULES @@ -724,8 +730,8 @@ noinst_LTLIBRARIES += libvirt_driver_esx.la libvirt_la_BUILT_LIBADD += libvirt_driver_esx.la endif libvirt_driver_esx_la_CFLAGS = $(LIBCURL_CFLAGS) \ - -I@top_srcdir@/src/conf -libvirt_driver_esx_la_LDFLAGS = + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_esx_la_LIBADD = $(LIBCURL_LIBS) if WITH_DRIVER_MODULES libvirt_driver_esx_la_LDFLAGS += -module -avoid-version @@ -743,9 +749,9 @@ noinst_LTLIBRARIES += libvirt_driver_network.la #libvirt_la_BUILT_LIBADD += libvirt_driver_network.la endif libvirt_driver_network_la_CFLAGS = \ - -I@top_srcdir@/src/conf + -I@top_srcdir@/src/conf $(AM_CFLAGS) if WITH_DRIVER_MODULES -libvirt_driver_network_la_LDFLAGS = -module -avoid-version +libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) endif libvirt_driver_network_la_SOURCES = $(NETWORK_DRIVER_SOURCES) endif @@ -762,8 +768,8 @@ noinst_LTLIBRARIES += libvirt_driver_interface.la libvirt_la_BUILT_LIBADD += libvirt_driver_interface.la endif libvirt_driver_interface_la_CFLAGS = $(NETCF_CFLAGS) \ - -I@top_srcdir@/src/conf -libvirt_driver_interface_la_LDFLAGS = + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_interface_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_interface_la_LIBADD = $(NETCF_LIBS) if WITH_DRIVER_MODULES libvirt_driver_interface_la_LDFLAGS += -module -avoid-version @@ -780,9 +786,9 @@ noinst_LTLIBRARIES += libvirt_driver_secret.la #libvirt_la_BUILT_LIBADD += libvirt_driver_secret.la endif libvirt_driver_secret_la_CFLAGS = \ - -I@top_srcdir@/src/conf + -I@top_srcdir@/src/conf $(AM_CFLAGS) if WITH_DRIVER_MODULES -libvirt_driver_secret_la_LDFLAGS = -module -avoid-version +libvirt_driver_secret_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) libvirt_driver_secret_la_LIBADD = ../gnulib/lib/libgnu.la endif libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES) @@ -791,8 +797,8 @@ endif # Needed to keep automake quiet about conditionals libvirt_driver_storage_la_SOURCES = libvirt_driver_storage_la_CFLAGS = \ - -I@top_srcdir@/src/conf -libvirt_driver_storage_la_LDFLAGS = + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_storage_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_storage_la_LIBADD = if WITH_STORAGE_DIR if WITH_DRIVER_MODULES @@ -843,8 +849,8 @@ endif libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES) libvirt_driver_nodedev_la_CFLAGS = \ - -I@top_srcdir@/src/conf -libvirt_driver_nodedev_la_LDFLAGS = + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_nodedev_la_LIBADD = if HAVE_HAL libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES) @@ -871,8 +877,8 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la noinst_LTLIBRARIES += libvirt_driver_nwfilter.la endif libvirt_driver_nwfilter_la_CFLAGS = $(LIBPCAP_CFLAGS) \ - -I@top_srcdir@/src/conf -libvirt_driver_nwfilter_la_LDFLAGS = + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS) libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) if WITH_DRIVER_MODULES libvirt_driver_nwfilter_la_LDFLAGS += -module -avoid-version @@ -886,8 +892,8 @@ libvirt_driver_security_la_SOURCES = $(SECURITY_DRIVER_SOURCES) noinst_LTLIBRARIES += libvirt_driver_security.la libvirt_la_BUILT_LIBADD += libvirt_driver_security.la libvirt_driver_security_la_CFLAGS = \ - -I@top_srcdir@/src/conf -libvirt_driver_security_la_LDFLAGS = + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_security_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_security_la_LIBADD = if WITH_SECDRIVER_SELINUX libvirt_driver_security_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES) @@ -1030,13 +1036,13 @@ libvirt.def: libvirt.syms libvirt_la_SOURCES = libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \ -version-info $(LIBVIRT_VERSION_INFO) \ - $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ + $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) libvirt_la_BUILT_LIBADD += ../gnulib/lib/libgnu.la libvirt_la_LIBADD += $(LIBXML_LIBS) \ $(DRIVER_MODULE_LIBS) \ $(CYGWIN_EXTRA_LIBADD) -libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT +libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS) # Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we # lose automake's automatic dependencies on an appropriate subset of # $(libvirt_la_LIBADD). But we were careful to create @@ -1058,8 +1064,8 @@ test_LDFLAGS = \ # Just like the above, but with a slightly different set of public symbols. libvirt_test_la_SOURCES = $(libvirt_la_SOURCES) libvirt_test_la_LIBADD = $(libvirt_la_LIBADD) -libvirt_test_la_LDFLAGS = $(test_LDFLAGS) -libvirt_test_la_CFLAGS = $(COVERAGE_CFLAGS) +libvirt_test_la_LDFLAGS = $(test_LDFLAGS) $(AM_LDFLAGS) +libvirt_test_la_CFLAGS = $(AM_CFLAGS) libvirt_qemu_la_SOURCES = libvirt-qemu.c libvirt_qemu_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \ @@ -1075,14 +1081,14 @@ if WITH_LIBVIRTD libexec_PROGRAMS += libvirt_parthelper libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES) -libvirt_parthelper_LDFLAGS = $(WARN_LDFLAGS) $(COVERAGE_LDFLAGS) +libvirt_parthelper_LDFLAGS = $(WARN_LDFLAGS) $(AM_LDFLAGS) libvirt_parthelper_LDADD = \ $(LIBPARTED_LIBS) \ $(DEVMAPPER_LIBS) \ libvirt_util.la \ ../gnulib/lib/libgnu.la -libvirt_parthelper_CFLAGS = $(LIBPARTED_CFLAGS) $(DEVMAPPER_CFLAGS) +libvirt_parthelper_CFLAGS = $(LIBPARTED_CFLAGS) $(AM_CFLAGS) endif endif EXTRA_DIST += $(STORAGE_HELPER_DISK_SOURCES) @@ -1100,7 +1106,7 @@ libvirt_lxc_SOURCES = \ $(DOMAIN_CONF_SOURCES) \ $(CPU_CONF_SOURCES) \ $(NWFILTER_PARAM_CONF_SOURCES) -libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) +libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(LIBXML_LIBS) $(NUMACTL_LIBS) $(LIB_PTHREAD) \ $(LIBNL_LIBS) ../gnulib/lib/libgnu.la @@ -1109,7 +1115,8 @@ libvirt_lxc_CFLAGS = \ $(NUMACTL_CFLAGS) \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ - -I@top_srcdir@/src/conf + -I@top_srcdir@/src/conf \ + $(AM_CFLAGS) endif endif EXTRA_DIST += $(LXC_CONTROLLER_SOURCES) @@ -1120,7 +1127,7 @@ libexec_PROGRAMS += virt-aa-helper virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) -virt_aa_helper_LDFLAGS = $(WARN_LDFLAGS) +virt_aa_helper_LDFLAGS = $(WARN_LDFLAGS) $(AM_LDFLAGS) virt_aa_helper_LDADD = \ $(LIBXML_LIBS) \ libvirt_conf.la \ @@ -1128,7 +1135,8 @@ virt_aa_helper_LDADD = \ ../gnulib/lib/libgnu.la virt_aa_helper_CFLAGS = \ -I@top_srcdir@/src/conf \ - -I@top_srcdir@/src/security + -I@top_srcdir@/src/security \ + $(AM_CFLAGS) endif endif EXTRA_DIST += $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) diff --git a/tests/.gitignore b/tests/.gitignore index 387a924..3f32939 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -23,8 +23,6 @@ statstest qparamtest seclabeltest eventtest -*.gcda -*.gcno *.exe object-locking object-locking.cmi -- 1.7.2

2 2

[libvirt] [PATCH] Do not use boot=on on IDE device
by Daniel Veillard 29 Jul '10

29 Jul '10

the followup on the boot=on problem, basically it's not needed to specify it when booting out of IDE devices when using KVM (and with newer seabios version it's also not needed for virtio). That patch isn't critical, it's more a cleanup one, I would delay this after the 0.8.3 release in any case, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] build: fix 'make syntax-check' failure
by Eric Blake 29 Jul '10

29 Jul '10

src/lxc/veth.c:150: VIR_DEBUG(_("Failed to delete '%s' (%d)"), src/lxc/veth.c:188: VIR_DEBUG(_("Failed to disable '%s' (%d)"), maint.mk: do not mark these strings for translation * src/lxc/veth.c (vethDelete, vethInterfaceUpOrDown): Don't translate VIR_DEBUG. --- Pushing as obvious. src/lxc/veth.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lxc/veth.c b/src/lxc/veth.c index acf28c7..5f038d6 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -1,6 +1,7 @@ /* * veth.c: Tools for managing veth pairs * + * Copyright (C) 2010 Red Hat, Inc. * Copyright IBM Corp. 2008 * * See COPYING.LIB for the License of this software @@ -147,7 +148,7 @@ int vethDelete(const char *veth) * Prevent overwriting an error log which may be set * where an actual failure occurs. */ - VIR_DEBUG(_("Failed to delete '%s' (%d)"), + VIR_DEBUG("Failed to delete '%s' (%d)", veth, WEXITSTATUS(cmdResult)); rc = -1; } @@ -185,7 +186,7 @@ int vethInterfaceUpOrDown(const char* veth, int upOrDown) * Prevent overwriting an error log which may be set * where an actual failure occurs. */ - VIR_DEBUG(_("Failed to disable '%s' (%d)"), + VIR_DEBUG("Failed to disable '%s' (%d)", veth, WEXITSTATUS(cmdResult)); else vethError(VIR_ERR_INTERNAL_ERROR, -- 1.7.2

1 0

[libvirt] Virt-install Error on Centos 5.4 64bit and kvm
by Cristian Rojas 29 Jul '10

29 Jul '10

Hi everyone: using this command to install a kvm virtual machine: virt-install --connect qemu:///system \ --name p3k0401 \ --ram 2048 \ --file //dev/VolGroup01/p3k0401logvol \ --accelerate \ -s 10 \ --nographics \ --hvm \ --location='http://10.1.4.80' I get: Starting install... Retrieving file vmlinuz... | 1.8 MB 00:00 Retrieving file initrd.img... | 7.1 MB 00:00 ERROR internal error Domain p3k0401 didn't show up Domain installation may not have been successful. If it was, you can restart your domain by running 'virsh start p3k0401'; otherwise, please restart your installation. ERROR internal error Domain p3k0401 didn't show up Traceback (most recent call last): File "/usr/sbin/virt-install", line 889, in ? main() File "/usr/sbin/virt-install", line 751, in main start_time, guest.start_install) File "/usr/sbin/virt-install", line 813, in do_install dom = install_func(conscb, progresscb, wait=(not wait)) File "/usr/lib/python2.4/site-packages/virtinst/Guest.py", line 541, in start_install return self._do_install(consolecb, meter, removeOld, wait) File "/usr/lib/python2.4/site-packages/virtinst/Guest.py", line 633, in _do_install self.domain = self.conn.createLinux(install_xml, 0) File "/usr/lib64/python2.4/site-packages/libvirt.py", line 974, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirtError: internal error Domain p3k0401 didn't show up On the /var/log/libvirt/qemu/p3k0401.log: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/ /usr/bin/qemu-system-x86_64 -S -M rhel5.4.0 -m 1024 -smp 1 -name p3k0401 -uuid 7658c102-0738-724c-40eb-e1c58b2c2369 -domid 3 -nographic -monitor pty -pidfile /var/run/libvirt/qemu//p3k0401.pid -no-reboot -boot c -kernel /var/lib/libvirt/boot/virtinst-vmlinuz.O_SOVo -initrd /var/lib/libvirt/boot/virtinst-initrd.img.0ba0Fp -append method=http://10.1.4.80 -drive file=//dev/VolGroup01/p3k0401logvol,if=ide,index=0,cache=none -net nic,macaddr=54:52:00:15:c4:50,vlan=0 -net tap,fd=16,script=,vlan=0,ifname=vnet0 -serial pty -parallel none -usb Supported machines are: pc Standard PC (alias of pc-0.12) pc-0.12 Standard PC (default) pc-0.11 Standard PC, qemu 0.11 pc-0.10 Standard PC, qemu 0.10 isapc ISA-only PC xenpv Xen Para-virtualized PC And my packages installed: # rpm -qa | grep qemu qemu-0.12.4-1.el5.rf # rpm -qa | grep kvm etherboot-zroms-kvm-5.4.4-13.el5.centos kmod-kvm-83-164.el5_5.12 kvm-83-164.el5_5.12 # rpm -qa | grep libvirt libvirt-0.6.3-33.el5_5.1 libvirt-0.6.3-33.el5_5.1 libvirt-python-0.6.3-33.el5_5.1 # uname -a Linux gs1p304 2.6.18-164.el5 #1 SMP Thu Sep 3 03:28:30 EDT 2009 x86_64 x86_64 x86_64 GNU/Linux Please any pointer is appreciated... Thanks Cris

2 1

[libvirt] [PATCH] lxc: Fix return value handlings of vethInterfaceUpOrDown and moveInterfaceToNetNs
by Ryota Ozaki 29 Jul '10

29 Jul '10

Both may return a positive value when they fail. We should check if the value is not zero instead of checking if it's negative. lxcContainerRenameAndEnableInterfaces is expected to return a negative value on a failure, so the patch changes the return value to -1 if vethInterfaceUpOrDown fails. Note that this patch may be related to the bug: https://bugzilla.redhat.com/show_bug.cgi?id=607496 . It would not fix the bug, but would unveil what happens. --- src/lxc/lxc_container.c | 7 ++++++- src/lxc/lxc_controller.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 4371dba..c77d262 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -273,8 +273,13 @@ static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, } /* enable lo device only if there were other net devices */ - if (veths) + if (veths) { rc = vethInterfaceUpOrDown("lo", 1); + if (0 != rc) { + VIR_ERROR(_("Failed to enable lo (%d)"), rc); + rc = -1; + } + } error_out: VIR_FREE(newname); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index d8b7bc7..9829a69 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -477,7 +477,7 @@ static int lxcControllerMoveInterfaces(unsigned int nveths, { unsigned int i; for (i = 0 ; i < nveths ; i++) - if (moveInterfaceToNetNs(veths[i], container) < 0) { + if (moveInterfaceToNetNs(veths[i], container) != 0) { lxcError(VIR_ERR_INTERNAL_ERROR, _("Failed to move interface %s to ns %d"), veths[i], container); -- 1.6.6.1

4 19

[libvirt] [PATCH] Eliminate memory leak in xenUnifiedDomainInfoListFree
by Laine Stump 29 Jul '10

29 Jul '10

From: Laine Stump <laine(a)redhat.com> This fixes a leak described in https://bugzilla.redhat.com/show_bug.cgi?id=590073 xenUnifiedDomainInfoList has a pointer to a list of pointers to xenUnifiedDomain. We were freeing up all the domains, but neglecting to free the list. This was found by Paolo Bonzini <pbonzini(a)redhat.com>. --- src/xen/xen_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index d121ea4..ddbfa7a 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2044,6 +2044,7 @@ xenUnifiedDomainInfoListFree(xenUnifiedDomainInfoListPtr list) VIR_FREE(list->doms[i]->name); VIR_FREE(list->doms[i]); } + VIR_FREE(list->doms); VIR_FREE(list); } -- 1.7.1.1

3 3

[libvirt] Schedule for release of libvirt-0.8.3
by Daniel Veillard 29 Jul '10

29 Jul '10

Small reminder, we will try to get back to a monthly release schedule so I'm targetting an end of month release for 0.8.3 . Assuming Friday 30 this would mean we enter the feature freeze at the end of the week. I'm gonna go over the pending patches, but if you have something not reviewed yet, please raise your voice just to be sure :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] Fix --with-xen-proxy related compile error
by Matthias Bolte 29 Jul '10

29 Jul '10

Move virDomainChrTargetTypeToString out of the #ifndef PROXY block, because it's used outside of it. --- src/conf/domain_conf.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 82e5ce7..883c682 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2441,26 +2441,6 @@ out: return ret; } -static const char * -virDomainChrTargetTypeToString(int deviceType, - int targetType) -{ - const char *type = NULL; - - switch (deviceType) { - case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: - type = virDomainChrChannelTargetTypeToString(targetType); - break; - case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: - type = virDomainChrConsoleTargetTypeToString(targetType); - break; - default: - break; - } - - return type; -} - static int virDomainChrDefParseTargetXML(virCapsPtr caps, virDomainChrDefPtr def, @@ -3952,6 +3932,26 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, #endif /* !PROXY */ +static const char * +virDomainChrTargetTypeToString(int deviceType, + int targetType) +{ + const char *type = NULL; + + switch (deviceType) { + case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: + type = virDomainChrChannelTargetTypeToString(targetType); + break; + case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: + type = virDomainChrConsoleTargetTypeToString(targetType); + break; + default: + break; + } + + return type; +} + static void virVirtualPortProfileFormat(virBufferPtr buf, virVirtualPortProfileParamsPtr virtPort, -- 1.7.0.4

3 3

[libvirt] [PATCH] lxc: Fix 'autostart' doesn't take effect actually
by Ryota Ozaki 29 Jul '10

29 Jul '10

lxcStartup forgot to call lxcAutostartConfigs. Fix it. This patch should fix https://bugzilla.redhat.com/show_bug.cgi?id=589863 . --- src/lxc/lxc_driver.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4fc1ecd..b286692 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1928,6 +1928,9 @@ static int lxcStartup(int privileged) virHashForEach(lxc_driver->domains.objs, lxcReconnectVM, lxc_driver); lxcDriverUnlock(lxc_driver); + + lxcAutostartConfigs(lxc_driver); + return 0; cleanup: -- 1.6.6.1

2 1

[libvirt] [PATCH] lxc: Fix error handlings of veth functions
by Ryota Ozaki 29 Jul '10

29 Jul '10

moveInterfaceToNetNs and vethInterfaceUpOrDown may return a positive value when they fail. We should check if the value is not zero instead of checking if it's negative. This defect may be related to the bug: https://bugzilla.redhat.com/show_bug.cgi?id=607496 . It would not fix the bug, but would unveil what happens. And also, the return value of positive is an exit code, not an errno. So we should not use virReportSystemError. Note that there still remains a problem that the descriptions of the functions are wrong; they say that the return value will be -1 on failure, however, they would actually return a positive value. The inconsistent should be fixed at some point. --- src/lxc/lxc_container.c | 7 ++++++- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 12 ++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 4371dba..c77d262 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -273,8 +273,13 @@ static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, } /* enable lo device only if there were other net devices */ - if (veths) + if (veths) { rc = vethInterfaceUpOrDown("lo", 1); + if (0 != rc) { + VIR_ERROR(_("Failed to enable lo (%d)"), rc); + rc = -1; + } + } error_out: VIR_FREE(newname); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index d8b7bc7..9829a69 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -477,7 +477,7 @@ static int lxcControllerMoveInterfaces(unsigned int nveths, { unsigned int i; for (i = 0 ; i < nveths ; i++) - if (moveInterfaceToNetNs(veths[i], container) < 0) { + if (moveInterfaceToNetNs(veths[i], container) != 0) { lxcError(VIR_ERR_INTERNAL_ERROR, _("Failed to move interface %s to ns %d"), veths[i], container); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4fc1ecd..51c273e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -886,9 +886,9 @@ static int lxcSetupInterfaces(virConnectPtr conn, char macaddr[VIR_MAC_STRING_BUFLEN]; virFormatMacAddr(def->nets[i]->mac, macaddr); if (0 != (rc = setMacAddr(containerVeth, macaddr))) { - virReportSystemError(rc, - _("Failed to set %s to %s"), - macaddr, containerVeth); + lxcError(VIR_ERR_INTERNAL_ERROR, + _("Failed to set %s to %s (%d)"), + macaddr, containerVeth, rc); goto error_exit; } } @@ -901,9 +901,9 @@ static int lxcSetupInterfaces(virConnectPtr conn, } if (0 != (rc = vethInterfaceUpOrDown(parentVeth, 1))) { - virReportSystemError(rc, - _("Failed to enable %s device"), - parentVeth); + lxcError(VIR_ERR_INTERNAL_ERROR, + _("Failed to enable %s device (%d)"), + parentVeth, rc); goto error_exit; } -- 1.6.6.1

1 0

[libvirt] [PATCH] Fix a potential race in pciInitDevice.
by Chris Lalancette 29 Jul '10

29 Jul '10

If detecting the FLR flag of a pci device fails, then we could run into the situation of trying to close a file descriptor twice, once in pciInitDevice() and once in pciFreeDevice(). Fix that by removing the pciCloseConfig() in pciInitDevice() and just letting pciFreeDevice() handle it. Thanks to Chris Wright for pointing out this problem. While we are at it, fix an error check. While it would actually work as-is (since success returns 0), it's still more clear to check for < 0 (as the rest of the code does). Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- src/util/pci.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b4c468a..9436e2a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8010,7 +8010,7 @@ static int qemudDomainAttachHostPciDevice(struct qemud_driver *driver, return -1; } - if (qemuPrepareHostdevPCIDevices(driver, &hostdev, 1)) + if (qemuPrepareHostdevPCIDevices(driver, &hostdev, 1) < 0) return -1; if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { diff --git a/src/util/pci.c b/src/util/pci.c index 14ef058..26d55b8 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -189,8 +189,10 @@ pciCloseConfig(pciDevice *dev) if (!dev) return; - if (dev->fd >= 0) + if (dev->fd >= 0) { close(dev->fd); + dev->fd = -1; + } } static int @@ -673,10 +675,8 @@ pciInitDevice(pciDevice *dev) dev->pcie_cap_pos = pciFindCapabilityOffset(dev, PCI_CAP_ID_EXP); dev->pci_pm_cap_pos = pciFindCapabilityOffset(dev, PCI_CAP_ID_PM); flr = pciDetectFunctionLevelReset(dev); - if (flr < 0) { - pciCloseConfig(dev); + if (flr < 0) return flr; - } dev->has_flr = flr; dev->has_pm_reset = pciDetectPowerManagementReset(dev); dev->initted = 1; -- 1.7.1.1

4 7

[libvirt] [PATCH 0/6 v2] qemu: virtio console support
by Cole Robinson 28 Jul '10

28 Jul '10

The following series adds virtio console XML and qemu driver support. The first 5 patches are testing, documentation, and internal cleanups to prepare for the actual support added in patch 6. Changes from v1: Add more regression tests Always show an explicit <console> target type in the XML Drop multiple console support (there be dragons) Drop name attribute from virtio <console> target Cole Robinson (6): tests: Test qemuxml2xml when expected xml changes docs: domain: Document virtio <channel> domain conf: Rename character prop targetType -> deviceType domain conf: char: Add an explicit targetType field domain conf: Track <console> target type qemu: virtio console support docs/formatdomain.html.in | 30 ++- docs/schemas/domain.rng | 35 ++- src/conf/capabilities.h | 1 + src/conf/domain_conf.c | 462 +++++++++++++------- src/conf/domain_conf.h | 37 ++- src/esx/esx_vmx.c | 4 +- src/libvirt_private.syms | 1 + src/qemu/qemu_conf.c | 54 ++- src/qemu/qemu_driver.c | 4 +- src/uml/uml_conf.c | 2 + src/vbox/vbox_tmpl.c | 4 +- src/xen/xen_hypervisor.c | 2 + src/xen/xend_internal.c | 7 +- src/xen/xm_internal.c | 7 +- tests/Makefile.am | 1 + tests/define-dev-segfault | 2 +- tests/domainschematest | 2 +- .../qemuxml2argv-balloon-device-auto.args | 1 + .../qemuxml2argv-balloon-device-auto.xml | 22 + .../qemuxml2argv-console-compat-auto.args | 1 + .../qemuxml2argv-console-compat-auto.xml | 28 ++ .../qemuxml2argv-console-compat.xml | 2 +- .../qemuxml2argv-console-virtio.args | 1 + .../qemuxml2argv-console-virtio.xml | 27 ++ .../qemuxml2argv-disk-scsi-device-auto.args | 1 + .../qemuxml2argv-disk-scsi-device-auto.xml | 28 ++ .../qemuxml2argv-disk-scsi-device.args | 1 + .../qemuxml2argv-disk-scsi-device.xml | 31 ++ tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 +- .../qemuxml2argv-serial-tcp-telnet.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 2 +- tests/qemuxml2argvtest.c | 9 + .../qemuxml2xmlout-balloon-device-auto.xml | 25 + .../qemuxml2xmlout-channel-virtio-auto.xml | 54 +++ .../qemuxml2xmlout-console-compat-auto.xml | 31 ++ .../qemuxml2xmlout-console-virtio.xml | 29 ++ .../qemuxml2xmlout-disk-scsi-device-auto.xml | 31 ++ tests/qemuxml2xmltest.c | 80 +++- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- .../sexpr2xml-disk-block-shareable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 +- .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 2 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml | 2 +- tests/vmx2xmldata/vmx2xml-serial-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-serial-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 +- .../test-paravirt-new-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 +- .../test-paravirt-old-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-old-pvfb.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- 95 files changed, 900 insertions(+), 277 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml

2 13

[libvirt] Extensions to the libvirt Storage API
by Patrick Dignan 28 Jul '10

28 Jul '10

Hi Everyone, I'm looking at implementing some functionality in libvirt that would allow it to call functions in an unpublished iSCSI library. Some of the functionality I wish to implement is not currently part of the libvirt storage API. I wanted to suggest the following additions to the storage API: grow volumes, show whether thin provisioning is enabled, enable thin provisioning, disable thin provisioning, create snapshots, and delete snapshots. I've added a patch at the end of the mail showing how I think these functions should be implemented. Note that I have not included details about the virStorageSnapshotDefPtr yet, that's the next step. Perhaps this should be in a separate mail for better threading, but it seems a bit strange to me that the storage interface isn't pluggable in the traditional sense. In order to add a backend to libvirt, one has to make modifications all over the place, for example: virt-inst, the Makefile.am, the configure.ac, storage_backend.h, and several other places. It would make sense to me to make this pluggable such that someone could just load in a library that implements the required functions and some identifying information (eg type of storage, description, etc). A list of supported backends could be stored in empty files in a directory somewhere, or some similar hack. This way someone could write a plugin for tgtd for example, or in my case the library I'm working with. I think this would also help others with writing plugins for more storage backends. How difficult do you think this would be? I'm willing to do a reasonable amount of work to get this implemented, but I want to know what the experts think! Best, Patrick Dignan --- libvirt-0.8.2.orig/src/storage/storage_backend.h 2010-06-16 17:27:22.000000000 -0500 +++ libvirt-0.8.2.work/src/storage/storage_backend.h 2010-07-27 16:36:08.321439851 -0500 @@ -43,6 +43,13 @@ typedef int (*virStorageBackendBuildVolFrom)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr origvol, virStorageVolDefPtr newvol, unsigned int flags); +typedef int (*virStorageBackendGrowVol)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned long long newsize); +typedef bool (*virStorageBackendThinProvisionShow)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol); +typedef int (*virStorageBackendThinProvisionEnable)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol); +typedef int (*virStorageBackendThinProvisionDisable)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol); + +typedef int (virStorageBackendCreateSnapshot)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStorageSnapshotDefPtr snapshot); +typedef int (virStorageBackendDeleteSnapshot)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStorageSnapshotDefPtr snapshot); /* File creation/cloning functions used for cloning between backends */ int virStorageBackendCreateRaw(virConnectPtr conn, @@ -76,6 +83,12 @@ virStorageBackendCreateVol createVol; virStorageBackendRefreshVol refreshVol; virStorageBackendDeleteVol deleteVol; + virStorageBackendGrowVol growVol; + virStorageBackendThinProvisionShow thinProvisionShow; + virStorageBackendThinProvisionEnable thinProvisionEnable; + virStorageBackendThinProvisionDisable thinProvisionDisable; + virStorageBackendCreateSnapshot createSnapshot; + virStorageBackendDeleteSnapshot deleteSnapshot; }; virStorageBackendPtr virStorageBackendForType(int type);

2 4

[libvirt] [PATCH] esx: Add vpx:// scheme to allow direct connection to a vCenter
by Matthias Bolte 28 Jul '10

28 Jul '10

Add a pointer to the primary context of a connection and use it in all driver functions that don't dependent on the context type. This includes almost all functions that deal with a virDomianPtr. Therefore, using a vpx:// connection allows you to perform all the usual domain related actions like start, destroy, suspend, resume, dumpxml etc. Some functions that require an explicitly specified ESX server don't work yet. This includes the host UUID, the hostname, the general node info, the max vCPU count and the free memory. Also not working yet are migration and defining new domains. --- docs/drvesx.html.in | 21 +- src/esx/esx_driver.c | 931 ++++++++++++++++++++++++------------------ src/esx/esx_private.h | 1 + src/esx/esx_storage_driver.c | 33 +- src/esx/esx_vmx.c | 2 + src/libvirt.c | 1 + 6 files changed, 562 insertions(+), 427 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index e8cee77..1f2ae4e 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -4,13 +4,14 @@ <p> 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. <span class="since">Since 0.8.3</span> the driver can also + connect to a VMware vCenter 2.5/4.0 (VPX). </p> <h2><a name="prereq">Deployment pre-requisites</a></h2> <p> - 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: </p> <pre> -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) </pre> <p> <strong>Note</strong>: In contrast to other drivers, the ESX driver is @@ -49,9 +51,9 @@ esx://example.com/?no_verify=1 (ESX over HTTPS, but doesn't verify the serve type://[username@]hostname[:port]/[?extraparameters] </pre> <p> - The <code>type://</code> is either <code>esx://</code> or + The <code>type://</code> is either <code>vpx://</code> or <code>esx://</code> or <code>gsx://</code> and the driver selects the default port depending - on it. For ESX the default HTTPS port is 443, for GSX it is 8333. If + on it. For VPX and ESX the default HTTPS port is 443, for GSX it is 8333. If the port parameter is given, it overrides the default port. </p> @@ -76,7 +78,7 @@ type://[username@]hostname[:port]/[?extraparameters] <code>http</code> or <code>https</code> </td> <td> - Overrides the default HTTPS transport. For ESX the default + Overrides the default HTTPS transport. For VPX and ESX the default HTTP port is 80, for GSX it is 8222. </td> </tr> @@ -91,6 +93,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 <code>*</code>, the driver connects to the vCenter known to the ESX server. + This paramater in useful when connecting to an ESX server only. </td> </tr> <tr> diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 33f421d..5922cb6 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}://[<username>@]<hostname>[:<port>]/[<query parameter> ...] + * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<query parameter> ...] * * 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>|*} + * - vcenter={<vcenter>|*} only useful for an esx:// connection * - no_verify={0|1} * - auto_answer={0|1} * - proxy=[{http|socks|socks4|socks4a|socks5}://]<hostname>[:<port>] @@ -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, &currentSnapshotTree, 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, &currentSnapshotTree, 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 19955a5..6c7edb1 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 98e7137..44d7d85 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 9035233..e075149 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 d1b210d..3ec5724 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 -- 1.7.0.4

3 9

[libvirt] OpenVZ ethernet interface type
by Jean-Baptiste Rouault 28 Jul '10

28 Jul '10

Hello, I'd like to be able to add interfaces to OpenVZ guests like the following vzctl command does : vzctl set 100 --netif_add eth0,00:11:22:33:44:55,tap0 Here, eth0 is the guest interface name, and tap0 the host interface name. This is currently not supported by libvirt so I'd like to implement it. In terms of domain XML I think it would be something like: <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <source dev='eth0'/> <target dev='tap0'/> </interface> Currently the OpenVZ driver calls "vzctl set 100 --ipadd" when the interface type is "ethernet" and the ip address attribute isn't empty. Does it seem ok to use --netif_add for ethernet interfaces when there is no ip defined ? Regards, Jean-Baptiste Rouault

1 0

[libvirt] [PATCH] fix handling of PORT_PROFILE_RESPONSE_INPROGRESS netlink message
by Gerhard Stenzel 28 Jul '10

28 Jul '10

During function test of the 802.1Qbg implementation in lldpad we came across a small problem in the handling of the netlink message corresponding to PORT_PROFILE_RESPONSE_INPROGRESS. This should not result in returning the default rc=1. Signed-off-by: Gerhard Stenzel <gerhard.stenzel(a)de.ibm.com> diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 635458d..a6d9a57 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -1025,6 +1025,7 @@ getPortProfileStatus(struct nlattr **tb, int32_t vf, if (is8021Qbg) { /* no in-progress here; may be missing */ *status = PORT_PROFILE_RESPONSE_INPROGRESS; + rc = 0; } else { msg = _("no IFLA_PORT_RESPONSE found in netlink message"); goto err_exit; -- Best regards, Gerhard Stenzel, ----------------------------------------------------------------------------------------------------------------------------------- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

2 1

[libvirt] [PATCH] maint: fix comment typos
by Eric Blake 28 Jul '10

28 Jul '10

* src/network/bridge_driver.c (networkAddMasqueradingIptablesRules): Fix spelling and grammar. --- Pushing under the trivial change rule. src/network/bridge_driver.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 80ed57a..d6c7ae1 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -643,12 +643,12 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, * * We need to end up with 3 rules in the table in this order * - * 1. protocol=tcp with sport mapping restricton - * 2. protocol=udp with sport mapping restricton + * 1. protocol=tcp with sport mapping restriction + * 2. protocol=udp with sport mapping restriction * 3. generic any protocol * * The sport mappings are required, because default IPtables - * MASQUERADE is maintain port number unchanged where possible. + * MASQUERADE maintain port numbers unchanged where possible. * * NFS can be configured to only "trust" port numbers < 1023. * -- 1.7.2

1 0