- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Fix authentication with passwords in libssh2 connection driver
by Peter Krempa 28 Nov '12

28 Nov '12

When keyboard interactive authentication is disabled on the remote host the usual way is to request a password and authenticate using tunneled password authentication. Libvirt's libssh2 driver didn't have this fallback and connections to such hosts failed. Peter Krempa (2): util: Add possibility to call virAuthGetPassword without conn object libssh2_transport: Add fallback authentication method for password auth src/rpc/virnetsshsession.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virauth.c | 13 ++++++---- 2 files changed, 72 insertions(+), 5 deletions(-) -- 1.8.0

2 7

[libvirt] [v0.10.2-maint][PATCH] qemu: Always format CPU topology
by Michal Privoznik 28 Nov '12

28 Nov '12

From: Jiri Denemark <jdenemar(a)redhat.com> When libvirt cannot find a suitable CPU model for host CPU (easily reproducible by running libvirt in a guest), it would not provide CPU topology in capabilities XML either. Even though CPU topology is known and can be queried by virNodeGetInfo. With this patch, CPU topology will always be provided in capabilities XML regardless on the presence of CPU model. (cherry picked from commit f1c70100409562c3f402392aa667732e5f89a2c4) Conflicts: src/qemu/qemu_capabilities.c src/qemu/qemu_command.c The new code uses capabilities caching. --- I am not sure about the correct process of this. So if there are some pointers .... src/qemu/qemu_capabilities.c | 6 +++--- src/qemu/qemu_domain.c | 4 +++- src/qemu/qemu_driver.c | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 37f1a2b..b1ef1b9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -844,6 +844,7 @@ qemuCapsInitGuest(virCapsPtr caps, guest->arch.defaultInfo.emulator_mtime = binary_mtime; if (caps->host.cpu && + caps->host.cpu->model && qemuCapsProbeCPUModels(binary, NULL, info->arch, &ncpus, NULL) == 0 && ncpus > 0 && !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)) @@ -973,12 +974,11 @@ qemuCapsInitCPU(virCapsPtr caps, cpu->sockets = nodeinfo.sockets; cpu->cores = nodeinfo.cores; cpu->threads = nodeinfo.threads; + caps->host.cpu = cpu; if (!(data = cpuNodeData(arch)) || cpuDecode(cpu, data, NULL, 0, NULL) < 0) - goto error; - - caps->host.cpu = cpu; + goto cleanup; ret = 0; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 17ae3b9..e23ff11 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1233,7 +1233,9 @@ qemuDomainDefFormatBuf(struct qemud_driver *driver, if ((flags & VIR_DOMAIN_XML_UPDATE_CPU) && def_cpu && (def_cpu->mode != VIR_CPU_MODE_CUSTOM || def_cpu->model)) { - if (!driver->caps || !driver->caps->host.cpu) { + if (!driver->caps || + !driver->caps->host.cpu || + !driver->caps->host.cpu->model) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot get host CPU capabilities")); goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0258dbb..c1c8fa4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10083,7 +10083,8 @@ qemuCPUCompare(virConnectPtr conn, if (!driver->caps) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot get host capabilities")); - } else if (!driver->caps->host.cpu) { + } else if (!driver->caps->host.cpu || + !driver->caps->host.cpu->model) { VIR_WARN("cannot get host CPU capabilities"); ret = VIR_CPU_COMPARE_INCOMPATIBLE; } else { -- 1.7.8.6

3 2

[libvirt] [PATCH 1/2] node_memory: Do not fail if there is parameter unsupported
by Osier Yang 28 Nov '12

28 Nov '12

It makes no sense to fail the whole command if there is parameter unsupported by the kernel. This patch fixes it by ignoring the unsupported parameter for getMemoryParameters, and ignoring the unsupported parameter for setMemoryParameters too if there are more than one parameters to set, otherwise error out. --- src/libvirt.c | 12 +++-- src/nodeinfo.c | 119 ++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 79 insertions(+), 52 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 4af6089..93ec068 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -6746,10 +6746,10 @@ error: * @nparams: pointer to number of memory parameters; input and output * @flags: extra flags; not used yet, so callers should always pass 0 * - * Get all node memory parameters. On input, @nparams gives the size - * of the @params array; on output, @nparams gives how many slots were - * filled with parameter information, which might be less but will - * not exceed the input value. + * Get all node memory parameters (parameter unsupported by OS will be + * ignored). On input, @nparams gives the size of the @params array; + * on output, @nparams gives how many slots were filled with parameter + * information, which might be less but will not exceed the input value. * * As a special case, calling with @params as NULL and @nparams as 0 on * input will cause @nparams on output to contain the number of parameters @@ -6811,7 +6811,9 @@ error: * value nparams of virDomainGetSchedulerType) * @flags: extra flags; not used yet, so callers should always pass 0 * - * Change all or a subset of the node memory tunables. + * Change all or a subset of the node memory tunables. Tunable + * unsupported by OS wll be ignored if @nparams is not 1, otherwise + * the function fails. * * Note that it's not recommended to use this function while the * outside tuning program is running (such as ksmtuned under Linux), diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 75d6524..718a3a4 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1058,21 +1058,13 @@ nodeGetCPUBitmap(int *max_id ATTRIBUTE_UNUSED) #ifdef __linux__ static int -nodeSetMemoryParameterValue(const char *field, +nodeSetMemoryParameterValue(const char *path, virTypedParameterPtr param) { - char *path = NULL; char *strval = NULL; int ret = -1; int rc = -1; - if (virAsprintf(&path, "%s/%s", - SYSFS_MEMORY_SHARED_PATH, field) < 0) { - virReportOOMError(); - ret = -2; - goto cleanup; - } - if (virAsprintf(&strval, "%u", param->value.ui) == -1) { virReportOOMError(); ret = -2; @@ -1080,13 +1072,12 @@ nodeSetMemoryParameterValue(const char *field, } if ((rc = virFileWriteStr(path, strval, 0)) < 0) { - virReportSystemError(-rc, _("failed to set %s"), field); + virReportSystemError(-rc, _("failed to set %s"), param->field); goto cleanup; } ret = 0; cleanup: - VIR_FREE(path); VIR_FREE(strval); return ret; } @@ -1101,7 +1092,9 @@ nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); #ifdef __linux__ - int ret = 0; + char *path = NULL; + int ret = -1; + int rc; int i; if (virTypedParameterArrayValidate(params, nparams, @@ -1117,30 +1110,40 @@ nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - if (STREQ(param->field, - VIR_NODE_MEMORY_SHARED_PAGES_TO_SCAN)) { - ret = nodeSetMemoryParameterValue("pages_to_scan", param); + char *field = strchr(param->field, '_'); + field++; + if (virAsprintf(&path, "%s/%s", + SYSFS_MEMORY_SHARED_PATH, field) < 0) { + virReportOOMError(); + goto cleanup; + } - /* Out of memory */ - if (ret == -2) - return -1; - } else if (STREQ(param->field, - VIR_NODE_MEMORY_SHARED_SLEEP_MILLISECS)) { - ret = nodeSetMemoryParameterValue("sleep_millisecs", param); + /* Ignore the unsupported the param field if there is other + * parameter to set, otherwise error out. + */ + if (!virFileExists(path)) { + if (nparams == 1) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("Parameter '%s' is not supported by " + "this kernel"), param->field); + goto cleanup; + } else { + VIR_WARN("Parameter '%s' is not supported by this kernel", + param->field); + continue; + } + } - /* Out of memory */ - if (ret == -2) - return -1; - } else if (STREQ(param->field, - VIR_NODE_MEMORY_SHARED_MERGE_ACROSS_NODES)) { - ret = nodeSetMemoryParameterValue("merge_across_nodes", param); + rc = nodeSetMemoryParameterValue(path, param); - /* Out of memory */ - if (ret == -2) - return -1; - } + /* Out of memory */ + if (rc == -2) + goto cleanup; } + ret = 0; +cleanup: + VIR_FREE(path); return ret; #else virReportError(VIR_ERR_NO_SUPPORT, "%s", @@ -1167,6 +1170,11 @@ nodeGetMemoryParameterValue(const char *field, goto cleanup; } + if (!virFileExists(path)) { + ret = -2; + goto cleanup; + } + if (virFileReadAll(path, 1024, &buf) < 0) goto cleanup; @@ -1217,6 +1225,7 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long long pages_volatile; unsigned long long full_scans = 0; int i; + int ret; if ((*nparams) == 0) { *nparams = NODE_MEMORY_PARAMETERS_NUM; @@ -1228,8 +1237,10 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, switch (i) { case 0: - if (nodeGetMemoryParameterValue("pages_to_scan", - &pages_to_scan) < 0) + ret = nodeGetMemoryParameterValue("pages_to_scan", &pages_to_scan); + if (ret == -2) + continue; + else if (ret == -1) return -1; if (virTypedParameterAssign(param, VIR_NODE_MEMORY_SHARED_PAGES_TO_SCAN, @@ -1239,8 +1250,10 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, break; case 1: - if (nodeGetMemoryParameterValue("sleep_millisecs", - &sleep_millisecs) < 0) + ret = nodeGetMemoryParameterValue("sleep_millisecs", &sleep_millisecs); + if (ret == -2) + continue; + else if (ret == -1) return -1; if (virTypedParameterAssign(param, VIR_NODE_MEMORY_SHARED_SLEEP_MILLISECS, @@ -1250,8 +1263,10 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, break; case 2: - if (nodeGetMemoryParameterValue("pages_shared", - &pages_shared) < 0) + ret = nodeGetMemoryParameterValue("pages_shared", &pages_shared); + if (ret == -2) + continue; + else if (ret == -1) return -1; if (virTypedParameterAssign(param, VIR_NODE_MEMORY_SHARED_PAGES_SHARED, @@ -1261,8 +1276,10 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, break; case 3: - if (nodeGetMemoryParameterValue("pages_sharing", - &pages_sharing) < 0) + ret = nodeGetMemoryParameterValue("pages_sharing", &pages_sharing); + if (ret == -2) + continue; + else if (ret == -1) return -1; if (virTypedParameterAssign(param, VIR_NODE_MEMORY_SHARED_PAGES_SHARING, @@ -1272,8 +1289,10 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, break; case 4: - if (nodeGetMemoryParameterValue("pages_unshared", - &pages_unshared) < 0) + ret = nodeGetMemoryParameterValue("pages_unshared", &pages_unshared); + if (ret == -2) + continue; + else if (ret == -1) return -1; if (virTypedParameterAssign(param, VIR_NODE_MEMORY_SHARED_PAGES_UNSHARED, @@ -1283,8 +1302,10 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, break; case 5: - if (nodeGetMemoryParameterValue("pages_volatile", - &pages_volatile) < 0) + ret = nodeGetMemoryParameterValue("pages_volatile", &pages_volatile); + if (ret == -2) + continue; + else if (ret == -1) return -1; if (virTypedParameterAssign(param, VIR_NODE_MEMORY_SHARED_PAGES_VOLATILE, @@ -1294,8 +1315,10 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, break; case 6: - if (nodeGetMemoryParameterValue("full_scans", - &full_scans) < 0) + ret = nodeGetMemoryParameterValue("full_scans", &full_scans); + if (ret == -2) + continue; + else if (ret == -1) return -1; if (virTypedParameterAssign(param, VIR_NODE_MEMORY_SHARED_FULL_SCANS, @@ -1305,8 +1328,10 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, break; case 7: - if (nodeGetMemoryParameterValue("merge_across_nodes", - &merge_across_nodes) < 0) + ret = nodeGetMemoryParameterValue("merge_across_nodes", &merge_across_nodes); + if (ret == -2) + continue; + else if (ret == -1) return -1; if (virTypedParameterAssign(param, VIR_NODE_MEMORY_SHARED_MERGE_ACROSS_NODES, -- 1.7.7.6

2 4

[libvirt] [PATCH] storage: fix device detach regression with cgroup ACLs
by Eric Blake 27 Nov '12

27 Nov '12

https://bugzilla.redhat.com/show_bug.cgi?id=876828 Commit 38c4a9cc introduced a regression in hot unplugging of disks from qemu, where cgroup device ACLs were no longer being revoked (thankfully not a security hole: cgroup ACLs only prevent open() of the disk; so reverting the ACL prevents future abuse but doesn't stop abuse from an fd that was already opened before the ACL change). The actual regression is due to a latent bug. The hot unplug code was computing the set of files to do cgroup ACL revocation based on the XML passed in by the user, rather than based on the domain's details on which disk was being deleted. As long as the revoke path was always recomputing the backing chain, this didn't really matter; but now that we want to compute the chain exactly once and remember that computation, we need to hang on to the backing chain until after the revoke has happened. * src/qemu/qemu_hotplug.c (qemuDomainDetachPciDiskDevice): Transfer backing chain before deletion. --- The patch is deceptively small for how long it took me to figure out why we had a regression :) src/qemu/qemu_hotplug.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ae8381e..0bc2259 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1999,6 +1999,8 @@ int qemuDomainDetachPciDiskDevice(struct qemud_driver *driver, virDomainDiskRemove(vm->def, i); + dev->data.disk->backingChain = detach->backingChain; + detach->backingChain = NULL; virDomainDiskDefFree(detach); if (virSecurityManagerRestoreImageLabel(driver->securityManager, -- 1.7.1

2 2

[libvirt] [PATCH] S390: Assign default model "virtio" for network interfaces
by Viktor Mihajlovski 27 Nov '12

27 Nov '12

If a network interface model is not specified, libvirt will run into an unchecked NULL pointer coredump. On the other hand if the empty model is ignored, a PCI bus address would be generated, which is not supported by S390. Since the only valid network type model for S390 is virtio, we use this as the default value, which is the same for QEMU. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7736575..592ab24 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -810,9 +810,14 @@ qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def, } for (i = 0; i < def->nnets ; i++) { + if (STRPREFIX(def->os.arch, "s390") && + def->nets[i]->model == NULL) { + def->nets[i]->model = strdup("virtio"); + } if (STREQ(def->nets[i]->model,"virtio") && - def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { def->nets[i]->info.type = type; + } } for (i = 0; i < def->ncontrollers ; i++) { -- 1.7.0.4

1 0

Re: [libvirt] [PATCH v2 00/13] parallels: implement operations with hard disks
by Dmitry Guryanov 27 Nov '12

27 Nov '12

On 121114 14:32:41, Dmitry Guryanov wrote: > This patch series adds ability to list existing disk images, > create a new ones and add or remove hard disk devices to the VM. > > Changes in v2: > rebased to current sources Sorry, forgot to run make syntax-check, it fails in some places :( > > Dmitry Guryanov (13): > parallels: add info about hard disk devices > parallels: handle disk devices in parallelsDomainDefineXML > parallels: split parallelsStorageOpen function > parallels: remove unused code from storage driver > parallels: create storage pools by VM list > parallels: fix leaks in parallelsFindVolumes > parallels: add info about volumes > parallels: fill volumes capacity parameter > parallels: split parallelsStorageVolumeDelete function > parallels: add function parallelsGetDiskBusName > parallels: add support of disks creation > parallels: apply config after VM creation > parallels: add support of removing disks > > src/parallels/parallels_driver.c | 346 +++++++++++++++++++++++++-- > src/parallels/parallels_storage.c | 479 +++++++++++++++++++++++++++++++------ > src/parallels/parallels_utils.h | 3 + > 3 files changed, 731 insertions(+), 97 deletions(-) > > -- > 1.7.7.6 >

1 0

[libvirt] [PATCH v5 0/4] Qemu/Gluster support in Libvirt
by Harsh Prateek Bora 27 Nov '12

27 Nov '12

Changelog: v5: - Separated initialization of new host members for nbd, rbd, sheepdog in a separate patch [Patch 3/4] - Fixed tests for appropriate args to DO_TEST - Code cleanups for squashing pointer incrememnts into single line. v4: - Addressed review comment by Jiri on v3 updated series. v3 updated: - Fix other network backends (nbd, rbd, sheepdog) to initialize new members (transport, socket) of _virDomainDiskHostDef appropriately so that garbage values doesnt break the argv2xml tests. v3: - RNG schema updated as required for unix transport [Paolo] - introduced another new attribute 'socket' for unix transport [Paolo] - Uses virURIFormat and virURIParse for URI parsing. [danpb] - updated documentation as required. [Jirka] v2: - Addressed review comments by Jiri - Updated patcheset as per new URI spec Ref: http://lists.gnu.org/archive/html/qemu-devel/2012-09/msg05199.html v1: - Initial prototype Harsh Prateek Bora (4): Add Gluster protocol as supported network disk backend qemu: Add support for gluster protocol based network storage backend. qemu: Fix nbd, rbd, sheepdog to initialize defaults for new host members. tests: Add tests for gluster protocol based network disks support docs/formatdomain.html.in | 24 ++- docs/schemas/domaincommon.rng | 33 +++- src/conf/domain_conf.c | 77 ++++++-- src/conf/domain_conf.h | 12 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 195 ++++++++++++++++++++- tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-disk-drive-network-gluster.args | 1 + .../qemuxml2argv-disk-drive-network-gluster.xml | 34 ++++ tests/qemuxml2argvtest.c | 2 + 10 files changed, 352 insertions(+), 29 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml -- 1.7.11.7

3 10

[libvirt] [PATCH v1 2/2][RFC] help to create disk images of non-shared migration
by liguang 27 Nov '12

27 Nov '12

try to do non-shared migration without bothering to create disk images at target by hand. consider this situation: 1. non-shared migration virsh migrate --copy-storage-all ... 2. migration fails 3. create disk images required qemu-img create ... 4 migration run smoothly so, try do remove step 2, 3, 4 this kind of usage had been discussed before, http://www.redhat.com/archives/libvir-list/2011-December/msg00451.html this patch depends on my support offline migration patch: https://www.redhat.com/archives/libvir-list/2012-November/msg00512.html Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_conf.h | 2 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_migration.c | 275 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 277 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 47f349c..ad789e9 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -102,6 +102,8 @@ struct qemud_driver { char *hugetlbfs_mount; char *hugepage_path; + void *private; + unsigned int macFilter : 1; ebtablesContext *ebtables; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b23056b..db11629 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1133,6 +1133,7 @@ static virDrvOpenStatus qemudOpen(virConnectPtr conn, } } } + qemu_driver->private = conn; conn->privateData = qemu_driver; return VIR_DRV_OPEN_SUCCESS; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 53171df..8b4e563 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -50,6 +50,7 @@ #include "storage_file.h" #include "viruri.h" #include "hooks.h" +#include "dirname.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -72,6 +73,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, QEMU_MIGRATION_COOKIE_FLAG_NETWORK, + QEMU_MIGRATION_COOKIE_FLAG_COPYSTORAGE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -79,13 +81,14 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent", "network"); + "graphics", "lockstate", "persistent", "network", "storage"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), QEMU_MIGRATION_COOKIE_NETWORK = (1 << QEMU_MIGRATION_COOKIE_FLAG_NETWORK), + QEMU_MIGRATION_COOKIE_COPYSTORAGE = (1 << QEMU_MIGRATION_COOKIE_FLAG_COPYSTORAGE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -119,6 +122,19 @@ struct _qemuMigrationCookieNetwork { qemuMigrationCookieNetDataPtr net; }; +typedef struct _qemuMigrationCookieStorageData qemuMigrationCookieStorageData; +typedef qemuMigrationCookieStorageData *qemuMigrationCookieStorageDataPtr; +struct _qemuMigrationCookieStorageData { + char *dsize; +}; + +typedef struct _qemuMigrationCookieStorage qemuMigrationCookieStorage; +typedef qemuMigrationCookieStorage *qemuMigrationCookieStoragePtr; +struct _qemuMigrationCookieStorage { + int ndisks; + qemuMigrationCookieStorageDataPtr disk; +}; + typedef struct _qemuMigrationCookie qemuMigrationCookie; typedef qemuMigrationCookie *qemuMigrationCookiePtr; struct _qemuMigrationCookie { @@ -147,6 +163,9 @@ struct _qemuMigrationCookie { /* If (flags & QEMU_MIGRATION_COOKIE_NETWORK) */ qemuMigrationCookieNetworkPtr network; + + /* If (flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) */ + qemuMigrationCookieStoragePtr storage; }; static void qemuMigrationCookieGraphicsFree(qemuMigrationCookieGraphicsPtr grap) @@ -175,6 +194,21 @@ qemuMigrationCookieNetworkFree(qemuMigrationCookieNetworkPtr network) VIR_FREE(network); } +static void +qemuMigrationCookieStorageFree(qemuMigrationCookieStoragePtr storage) +{ + int i; + + if (!storage) + return; + + if (storage->disk) { + for (i = 0; i < storage->ndisks; i++) + VIR_FREE(storage->disk[i].dsize); + } + VIR_FREE(storage->disk); + VIR_FREE(storage); +} static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) { @@ -187,6 +221,9 @@ static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) if (mig->flags & QEMU_MIGRATION_COOKIE_NETWORK) qemuMigrationCookieNetworkFree(mig->network); + if (mig->flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) + qemuMigrationCookieStorageFree(mig->storage); + VIR_FREE(mig->localHostname); VIR_FREE(mig->remoteHostname); VIR_FREE(mig->name); @@ -356,6 +393,45 @@ error: return NULL; } +static qemuMigrationCookieStoragePtr +qemuMigrationCookieStorageAlloc(struct qemud_driver *driver, + virDomainDefPtr def) +{ + int i; + qemuMigrationCookieStoragePtr mig; + virDomainBlockInfo info; + virDomainPtr dom; + virConnectPtr conn = driver->private; + + dom = virGetDomain(conn, def->name, def->uuid); + if (!dom) + goto error; + dom->id = def->id; + + if (VIR_ALLOC(mig) < 0) + goto no_memory; + if (VIR_ALLOC_N(mig->disk, def->ndisks) < 0) + goto no_memory; + + mig->ndisks = def->ndisks; + + for (i = 0; i < mig->ndisks; i++) { + if (virDomainGetBlockInfo(dom, def->disks[i]->src, + &info, 0) < 0) + goto error; + if (virAsprintf(&(mig->disk[i].dsize), "%llu", info.capacity) < 0) + goto no_memory; + } + + return mig; + +no_memory: + virReportOOMError(); +error: + qemuMigrationCookieStorageFree(mig); + return NULL; +} + static qemuMigrationCookiePtr qemuMigrationCookieNew(virDomainObjPtr dom) { @@ -491,6 +567,31 @@ qemuMigrationCookieAddNetwork(qemuMigrationCookiePtr mig, return 0; } +static int qemuMigrationCookieAddStorage(qemuMigrationCookiePtr mig, + struct qemud_driver *driver, + virDomainObjPtr dom) +{ + if (mig->flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("migration storage data already present")); + return -1; + } + + virDomainObjUnlock(dom); + qemuDriverUnlock(driver); + + if (dom->def->ndisks > 0) { + mig->storage = qemuMigrationCookieStorageAlloc(driver, dom->def); + if (!mig->storage) + return -1; + mig->flags |= QEMU_MIGRATION_COOKIE_COPYSTORAGE; + } + + qemuDriverLock(driver); + virDomainObjLock(dom); + + return 0; +} static void qemuMigrationCookieGraphicsXMLFormat(virBufferPtr buf, qemuMigrationCookieGraphicsPtr grap) @@ -540,6 +641,19 @@ qemuMigrationCookieNetworkXMLFormat(virBufferPtr buf, virBufferAddLit(buf, " </network>\n"); } +static void +qemuMigrationCookieStorageXMLFormat(virBufferPtr buf, + qemuMigrationCookieStoragePtr dsz) +{ + int i = 0; + + for (i = 0; i < dsz->ndisks; i++) { + char *dsize = dsz->disk[i].dsize; + virBufferAsprintf(buf, " <copystorage>\n"); + virBufferAsprintf(buf, " <disksize>%s</disksize>\n", dsize); + virBufferAddLit(buf, " </copystorage>\n"); + } +} static int qemuMigrationCookieXMLFormat(struct qemud_driver *driver, @@ -594,6 +708,9 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, if ((mig->flags & QEMU_MIGRATION_COOKIE_NETWORK) && mig->network) qemuMigrationCookieNetworkXMLFormat(buf, mig->network); + if ((mig->flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) && mig->storage) + qemuMigrationCookieStorageXMLFormat(buf, mig->storage); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -721,6 +838,44 @@ error: goto cleanup; } +static qemuMigrationCookieStoragePtr +qemuMigrationCookieStorageXMLParse(xmlXPathContextPtr ctxt) +{ + qemuMigrationCookieStoragePtr dsz; + int i, n; + xmlNodePtr *storage = NULL; + + if (VIR_ALLOC(dsz) < 0) + goto no_memory; + + if ((n = virXPathNodeSet("./copystorage", ctxt, &storage)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing storage information")); + goto error; + } + + dsz->ndisks = n; + if (VIR_ALLOC_N(dsz->disk, dsz->ndisks) < 0) + goto no_memory; + + for (i = 0; i < dsz->ndisks; i++) { + ctxt->node = storage[i]; + if (!(dsz->disk[i].dsize = virXPathString("string(./disksize[1])", ctxt))) + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing tlsPort attribute in migration data")); + } + +cleanup: + VIR_FREE(storage); + return dsz; + +no_memory: + virReportOOMError(); +error: + qemuMigrationCookieStorageFree(dsz); + dsz = NULL; + goto cleanup; +} static int qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, @@ -873,6 +1028,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, (!(mig->network = qemuMigrationCookieNetworkXMLParse(ctxt)))) goto error; + if ((flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) && + virXPathBoolean("count(./copystorage) > 0", ctxt) && + (!(mig->storage = qemuMigrationCookieStorageXMLParse(ctxt)))) + goto error; + return 0; error: @@ -937,6 +1097,11 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, return -1; } + if (flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE && + qemuMigrationCookieAddStorage(mig, driver, dom) < 0) { + return -1; + } + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1442,6 +1607,14 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & (VIR_MIGRATE_NON_SHARED_DISK | + VIR_MIGRATE_NON_SHARED_INC)) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_COPYSTORAGE) < 0) + goto cleanup; + } + if (flags & VIR_MIGRATE_OFFLINE) { if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) { @@ -1487,6 +1660,91 @@ cleanup: } +/* + if gen is true, find out disk images migration required, + so try to generate them at target, + if gen is false, delete disk images generated before. +*/ +static int qemuMigrationHandleDiskFiles(struct qemud_driver *driver, + virDomainDefPtr def, bool gen, + qemuMigrationCookiePtr mig) +{ + char *tmp_dir = NULL, *outbuf = NULL; + const char *img_tool = driver->qemuImgTool; + const char *disk_format[] = {"none", "raw", "none", "none", "none", + "cow", "none", "none", "qcow", "qcow2", + "qed", "vmdk", "vpc","none", "none" + }; + virCommandPtr cmd = NULL; + int i, ret = -1; + + if (!def->ndisks) + return 0; + + if (img_tool == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unable to find kvm-img or qemu-img")); + goto error; + } + + for (i = 0; i < def->ndisks; i++) { + if (STRNEQ(def->disks[i]->driverName, "qemu")) + continue; + if (def->disks[i]->src == NULL) + continue; + if (virFileExists(def->disks[i]->src) && gen) + continue; + if (!gen && !virFileExists(def->disks[i]->src)) + continue; + if ((tmp_dir = mdir_name(def->disks[i]->src)) == NULL) + continue; + if (!virFileExists(tmp_dir)) + if (virFileMakePath(tmp_dir) < 0) + continue; + if (STREQ(disk_format[def->disks[i]->format], "none")) + continue; + if (def->disks[i]->format < VIR_STORAGE_FILE_RAW) + goto error; + if (def->disks[i]->format >= VIR_STORAGE_FILE_LAST) + goto error; + + if (gen) { + char *dsize = mig->storage->disk[i].dsize; + cmd = virCommandNewArgList(img_tool, "create", "-f", + disk_format[def->disks[i]->format], + def->disks[i]->src, NULL); + virCommandAddArgFormat(cmd, "%s", dsize); + if (def->disks[i]->encryption) + virCommandAddArgList(cmd, "-o", "encryption=on", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) { + virReportSystemError(errno, "%s", outbuf); + goto cleanup; + } + } else { + if (unlink(def->disks[i]->src) < 0) { + virReportError(errno, "%s", _("fail to unlink disk image file")); + goto cleanup; + } + } + virCommandFree(cmd); + VIR_FREE(tmp_dir); + VIR_FREE(outbuf); + } + + ret = 0; + +cleanup: + if (ret < 0) { + virCommandFree(cmd); + VIR_FREE(tmp_dir); + VIR_FREE(outbuf); + } +error: + return ret; +} + + /* Prepare is the first step, and it runs on the destination host. */ @@ -1602,6 +1860,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* virDomainAssignDef already set the error */ goto cleanup; } + + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_COPYSTORAGE))) + goto cleanup; + + if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) + if (qemuMigrationHandleDiskFiles(driver, def, true, mig) < 0) + goto endjob; + def = NULL; priv = vm->privateData; priv->origname = origname; @@ -3247,6 +3514,7 @@ qemuMigrationFinish(struct qemud_driver *driver, virErrorPtr orig_err = NULL; int cookie_flags = 0; qemuDomainObjPrivatePtr priv = vm->privateData; + bool migration_status = false; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", @@ -3416,7 +3684,12 @@ qemuMigrationFinish(struct qemud_driver *driver, if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, 0) < 0) VIR_WARN("Unable to encode migration cookie"); + migration_status = true; + endjob: + if (!migration_status && flags & + (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) + qemuMigrationHandleDiskFiles(driver, vm->def, false, NULL); if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; } else if (!vm->persistent && !virDomainObjIsActive(vm)) { -- 1.7.2.5

3 3

[libvirt] [PATCH 0/6] Unprivileged SG_IO support
by Osier Yang 27 Nov '12

27 Nov '12

Hi, As a result of RFC [1], this implements the unprivleged SG_IO support. Though this is a bit rushed, and I still have no chance to test it yet, but I'd like see an earlier reviewing. @Paolo, please let me known once you have a kernel build with the new sysfs knob support. Thanks! Osier Yang (6): unpriv_sgio: Add docs and rng schema for new XML unpriv_sgio unpriv_sgio: Parse and format the new XML unpriv_sgio: Prepare helpers for unpriv_sgio setting unpriv_sgio: Manage unpriv_sgio in domain's lifecyle unpriv_sgio: Do not restore unpriv_sgio if the disk is being used unpriv_sgio: Error out if the unpriv_sgio setting conflicts with others docs/formatdomain.html.in | 10 +- docs/schemas/domaincommon.rng | 52 ++++-- src/conf/domain_conf.c | 168 ++++++++++++++++++-- src/conf/domain_conf.h | 18 ++ src/libvirt_private.syms | 6 + src/qemu/qemu_process.c | 54 +++++++ src/util/util.c | 154 ++++++++++++++++++ src/util/util.h | 7 + ...l2argv-disk-scsi-lun-passthrough-upriv-sgio.xml | 32 ++++ tests/qemuxml2xmltest.c | 1 + 10 files changed, 472 insertions(+), 30 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-upriv-sgio.xml [1] https://www.redhat.com/archives/libvir-list/2012-November/msg00988.html Regards, Osier

3 13

[libvirt] [test-API][PATCH V2] Add managedsave test cases
by hongming 27 Nov '12

27 Nov '12

The patch V2 inclues fixing all spots commented by Gren The managedsave test cases and test suite cover test include verifying virsh commands managedsave(include all flags and their combination)/managedsave-remove and managedSaveRemove/ManagedSave/ hasManagedSaveImage python APIs. The following new files be created. new file: cases/managedsave.conf - Test all test cases new file: repos/managedsave/__init__.py new file: repos/managedsave/managedsave.py - Test mangaedsave command/API and all flags new file: repos/managedsave/managedsave_remove.py - Test managedsave-remove command/API new file: repos/managedsave/managedsave_start.py - Verfiy managedsave'flags and start from managedsave image --- cases/managedsave.conf | 63 ++++++++++++ repos/managedsave/managedsave.py | 159 +++++++++++++++++++++++++++++++ repos/managedsave/managedsave_remove.py | 60 ++++++++++++ repos/managedsave/managedsave_start.py | 150 +++++++++++++++++++++++++++++ 4 files changed, 432 insertions(+), 0 deletions(-) create mode 100644 cases/managedsave.conf create mode 100644 repos/managedsave/__init__.py create mode 100644 repos/managedsave/managedsave.py create mode 100644 repos/managedsave/managedsave_remove.py create mode 100644 repos/managedsave/managedsave_start.py diff --git a/cases/managedsave.conf b/cases/managedsave.conf new file mode 100644 index 0000000..8dcafe2 --- /dev/null +++ b/cases/managedsave.conf @@ -0,0 +1,63 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + macaddr + 54:52:00:4a:16:30 + +#VIR_DOMAIN_SAVE_BYPASS_CACHE = 1 +#VIR_DOMAIN_SAVE_RUNNING = 2 +#VIR_DOMAIN_SAVE_PAUSED = 4 +#No_FLAGS = 0 +managedsave:managedsave + guestname + $defaultname + flags + 1|2 + +managedsave:managedsave_start + guestname + $defaultname + flags + noping + +managedsave:managedsave + guestname + $defaultname + flags + 1|4 + +managedsave:managedsave_start + guestname + $defaultname + flags + noping + +managedsave:managedsave + guestname + $defaultname + flags + 0 + +managedsave:managedsave_remove + guestname + $defaultname + +managedsave:managedsave_start + guestname + $defaultname + flags + noping diff --git a/repos/managedsave/__init__.py b/repos/managedsave/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/repos/managedsave/managedsave.py b/repos/managedsave/managedsave.py new file mode 100644 index 0000000..a126cd8 --- /dev/null +++ b/repos/managedsave/managedsave.py @@ -0,0 +1,159 @@ +#!/usr/bin/env python + +import os +import math + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'flags',) +optional_params = {} + +def check_guest_status(*args): + """Check guest current status""" + (domobj, logger) = args + state = domobj.info()[0] + logger.debug("current guest status: %s" % state) + + if state == libvirt.VIR_DOMAIN_SHUTOFF or \ + state == libvirt.VIR_DOMAIN_SHUTDOWN or \ + state == libvirt.VIR_DOMAIN_BLOCKED: + return False + else: + return True + +def check_savefile_create(*args): + """Check guest's managed save file be created""" + + (guestname) = args + cmds = "ls /var/lib/libvirt/qemu/save/%s" % guestname + ".save -lh" + logger.info("Execute cmd %s" % cmds) + (status, output) = utils.exec_cmd(cmds, shell=True) + if status != 0: + logger.error("No managed save file") + return False + else : + logger.info("managed save file exists") + return True + +def compare_cachedfile(cachebefore, cacheafter): + """Compare cached value before managed save and its value after + managed save """ + + diff = cacheafter - cachebefore + logger.info("diff is %s " % diff) + percent = math.fabs(diff)/cachebefore + logger.info("diff percent is %s " % percent) + if percent < 0.05: + return True + else: + return False + +def get_cachevalue(): + """Get the file system cached value """ + + cmds = "head -n4 /proc/meminfo|grep Cached|awk '{print $2}'" + (status, output) = utils.exec_cmd(cmds, shell=True) + if status != 0: + logger.error("Fail to run cmd line to get cache") + return 1 + else: + logger.debug(output[0]) + cachevalue= int(output[0]) + return cachevalue + +def managedsave(params): + """Managed save a running domain""" + + global logger + logger = params['logger'] + guestname = params['guestname'] + flags = params ['flags'] + #Save given flags to sharedmod.data + sharedmod.data['flagsave'] = flags + + logger.info("The given flags are %s " % flags) + if not '|' in flags: + flagn = int(flags) + else: + # bitwise-OR of flags of managedsave + flaglist = flags.split('|') + flagn = 0 + for flag in flaglist: + flagn |= int(flag) + + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) + + if not check_guest_status(domobj, logger): + logger.error("Current guest status is shutoff") + return 1 + + try: + + logger.info("bitwise OR value of flags is %s" % flagn) + + if flagn == 0: + logger.info("managedsave %s domain with no flag" % guestname) + elif flagn == 1: + logger.info("managedsave %s domain --bypass-cache" % guestname) + elif flagn == 2: + logger.info("managedsave %s domain --running" % guestname) + elif flagn == 3: + logger.info("managedsave %s domain --running --bypass-cache"\ + % guestname) + elif flagn == 4: + logger.info("managedsave %s domain --paused" % guestname) + elif flagn == 5: + logger.info("managedsave %s domain --paused --bypass-cache"\ + % guestname) + elif flagn == 6: + logger.error("--running and --paused are mutually exclusive") + return 1 + elif flagn == 7: + logger.error("--running and --paused are mutually exclusive") + return 1 + else: + logger.error("Wrong flags be given and fail to managedsave domain") + return 1 + + #If given flags include bypass-cache,check if bypass file system cache + if flagn % 2 == 1: + logger.info("Given flags include --bypass-cache") + os.system('echo 3 > /proc/sys/vm/drop_caches') + cache_before = get_cachevalue() + logger.info("Cached value before managedsave is %s" % cache_before) + + domobj.managedSave(flagn) + + cache_after = get_cachevalue() + logger.info("Cached value after managedsave is %s" % cache_after) + + if compare_cachedfile(cache_before, cache_after): + logger.info("Bypass file system cache successfully") + else: + logger.error("Bypass file system cache failed") + return 1 + else: + domobj.managedSave(flagn) + + #Check if domain has managedsave image + if domobj.hasManagedSaveImage(0) and \ + domobj.info()[0]==libvirt.VIR_DOMAIN_SHUTOFF and \ + check_savefile_create(guestname): + logger.info("Domain %s managedsave successfully " % guestname) + else: + logger.error("Fail to managedsave domain") + return 1 + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % e.message) + logger.error("Fail to managedsave %s domain" % guestname) + return 1 + + return 0 + diff --git a/repos/managedsave/managedsave_remove.py b/repos/managedsave/managedsave_remove.py new file mode 100644 index 0000000..a0eec1f --- /dev/null +++ b/repos/managedsave/managedsave_remove.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python +# Save domain as a statefile + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname',) +optional_params = {} + +def check_savefile_remove(*args): + """Check if guest's managedsave file be removed """ + + (guestname) = args + cmds = "ls /var/lib/libvirt/qemu/save/%s" % guestname + ".save -lh" + logger.info("Execute cmd %s" % cmds) + (status, output) = utils.exec_cmd(cmds, shell=True) + if status != 0: + logger.info("No managed save file") + return True + else : + logger.error("managed save file exits") + return False + +def managedsave_remove(params): + """Remove an existing managed save state file from a domain""" + + global logger + logger = params['logger'] + guestname = params['guestname'] + + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) + + if not domobj.hasManagedSaveImage(0) and check_savefile_remove(guestname): + logger.error("Domain %s hasn't managedsave image" % guestname) + return 1 + else: + logger.info("Domain %s has managedsave image" % guestname) + + try: + domobj.managedSaveRemove(0) + #Check if domain has managedsave image + if not domobj.hasManagedSaveImage(0) and \ + check_savefile_remove(guestname): + logger.info("Domain %s's managedsave image has been removed"\ + % guestname) + else: + logger.error("Fail to remove managedsave domain") + return 1 + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" % e.message) + logger.error("Fail to managedsave %s domain" % guestname) + return 1 + + return 0 + diff --git a/repos/managedsave/managedsave_start.py b/repos/managedsave/managedsave_start.py new file mode 100644 index 0000000..70539ae --- /dev/null +++ b/repos/managedsave/managedsave_start.py @@ -0,0 +1,150 @@ +#!/usr/bin/env python + +import time + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname',) +optional_params = {'flags' : ''} + +NONE = 0 +START_PAUSED = 1 + +def check_savefile_remove(*args): + """Check guest managed save file""" + (guestname) = args + cmds = "ls /var/lib/libvirt/qemu/save/%s" % guestname + ".save -lh" + logger.info("Execute cmd %s" % cmds) + (status, output) = utils.exec_cmd(cmds, shell=True) + if status != 0: + logger.info("No managed save file") + return True + else : + logger.error("managed save file exists") + return False + +def managedsave_start(params): + """ Start domain with managedsave image and check if its status is right + according to given flags of running managedsave command.If it is + correctly paused , resume it. + + Argument is a dictionary with two keys: + {'logger': logger, 'guestname': guestname} + + logger -- an object of utils/log.py + mandatory arguments : guestname -- same as the domain name + optional arguments : flags -- domain create flags <none|start_paused + |noping>.It allows only one flag be given. + + Return 0 on SUCCESS or 1 on FAILURE + """ + domname = params['guestname'] + global logger + logger = params['logger'] + flags = params.get('flags', '') + # Get given flags of managedsave + if sharedmod.data.has_key('flagsave'): + flagsave = sharedmod.data.get('flagsave') + else: + logger.error("Failed to get flags from managedsave") + # Clean sharedmod.data + sharedmod.data = {} + + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(domname) + + timeout = 600 + logger.info('start domain') + # Check if guest has managedsave image before start + if domobj.hasManagedSaveImage(0) : + logger.info("Domain has managedsave image") + else: + logger.info("Domain hasn't managedsave image") + + try: + if "none" in flags: + domobj.createWithFlags(NONE) + elif "start_paused" in flags: + domobj.createWithFlags(START_PAUSED) + else: + # this covers flags = None as well as flags = 'noping' + domobj.create() + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % e.message) + logger.error("start failed") + return 1 + + while timeout: + state = domobj.info()[0] + expect_states = [libvirt.VIR_DOMAIN_RUNNING,libvirt.VIR_DOMAIN_PAUSED,\ + libvirt.VIR_DOMAIN_NOSTATE,libvirt.VIR_DOMAIN_BLOCKED] + + if state in expect_states: + break + + time.sleep(10) + timeout -= 10 + logger.info(str(timeout) + "s left") + + if timeout <= 0: + logger.error('The domain state is not as expected, state: ' + state) + return 1 + + logger.info("Guest started") + + """If domain's current state is paused. Check if start command has + --paused flag or managedsave has --paused flag (given flags in managedsave + include '4'). If yes, it means domain successfully paused , then resume it. + If not, throw error -guest state error.""" + + if state == libvirt.VIR_DOMAIN_PAUSED: + if "start_paused" in flags or "4" in flagsave: + logger.info("Guest paused successfully ") + + try: + domobj.resume() + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % e.message) + logger.error("resume failed") + return 1 + stateresume = domobj.info()[0] + expect_states = [libvirt.VIR_DOMAIN_RUNNING, \ + libvirt.VIR_DOMAIN_NOSTATE, \ + libvirt.VIR_DOMAIN_BLOCKED] + if stateresume not in expect_states: + logger.error('The domain state is not equal to "paused"') + return 1 + else: + logger.info('Domain resume successfully') + return 0 + else: + logger.error("guest state error") + return 1 + + # Get domain ip and ping ip to check domain's status + if not "noping" in flags: + mac = utils.get_dom_mac_addr(domname) + logger.info("get ip by mac address") + ip = utils.mac_to_ip(mac, 180) + + logger.info('ping guest') + if not utils.do_ping(ip, 300): + logger.error('Failed on ping guest, IP: ' + str(ip)) + return 1 + + # Check if domain' managedsave image exists,if not, return 0. + if not domobj.hasManagedSaveImage(0) and check_savefile_remove(domname): + logger.info("Domain %s with managedsave image successfully start" \ + % domname) + return 0 + else: + logger.error("Fail to start domain s% with managedsave image" \ + % domname) + return 1 -- 1.7.7.6

2 1

[libvirt] libvirt [PATCHv2 1/2] Refactor ESX storage driver to implement facade pattern
by Ata E Husain Bohra 27 Nov '12

27 Nov '12

The patch refactors the current ESX storage driver due to following reasons: 1. Given most of the public APIs exposed by the storage driver in Libvirt remains same, ESX storage driver should not implement logic specific for only one supported format (current implementation only supports VMFS). 2. Decoupling interface from specific storage implementation gives us an extensible design to hook implementation for other supported storage formats. This patch refactors the current driver to implement it as a facade pattern i.e. the driver exposes all the public libvirt APIs, but uses backend drivers to get the required task done. The backend drivers provide implementation specific to the type of storage device. File changes: ------------------ esx_storage_driver.c ----> esx_storage_driver.c (base storage driver) | |---> esx_storage_backend_vmfs.c (VMFS backend) One of the task base storage driver need to do is to decide which backend driver needs to be invoked for a given request. This approach extends virStoragePool and virStorageVol to store extra parameters: 1. privateData: stores pointer to respective backend storage driver. 2. privateDataFreeFunc: stores cleanup function pointer. virGetStoragePool and virGetStorageVol are modfiied to accept these extra parameters as user params. virStoragePoolDispose and virStorageVolDispose checks for cleanup operation if available. --- daemon/remote.c | 6 +- src/Makefile.am | 1 + src/conf/storage_conf.c | 3 +- src/datatypes.c | 25 +- src/datatypes.h | 24 +- src/esx/esx_driver.c | 6 +- src/esx/esx_storage_backend_vmfs.c | 1491 ++++++++++++++++++++++++++++++++++++ src/esx/esx_storage_backend_vmfs.h | 30 + src/esx/esx_storage_driver.c | 1319 +++++-------------------------- src/esx/esx_vi.c | 5 +- src/esx/esx_vi.h | 3 +- src/parallels/parallels_storage.c | 24 +- src/remote/remote_driver.c | 6 +- src/storage/storage_driver.c | 28 +- src/test/test_driver.c | 30 +- src/vbox/vbox_tmpl.c | 14 +- 16 files changed, 1843 insertions(+), 1172 deletions(-) create mode 100644 src/esx/esx_storage_backend_vmfs.c create mode 100644 src/esx/esx_storage_backend_vmfs.h diff --git a/daemon/remote.c b/daemon/remote.c index 340d07d..41b8ea8 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4651,14 +4651,16 @@ get_nonnull_interface(virConnectPtr conn, remote_nonnull_interface iface) static virStoragePoolPtr get_nonnull_storage_pool(virConnectPtr conn, remote_nonnull_storage_pool pool) { - return virGetStoragePool(conn, pool.name, BAD_CAST pool.uuid); + return virGetStoragePool(conn, pool.name, BAD_CAST pool.uuid, + NULL, NULL); } static virStorageVolPtr get_nonnull_storage_vol(virConnectPtr conn, remote_nonnull_storage_vol vol) { virStorageVolPtr ret; - ret = virGetStorageVol(conn, vol.pool, vol.name, vol.key); + ret = virGetStorageVol(conn, vol.pool, vol.name, vol.key, + NULL, NULL); return ret; } diff --git a/src/Makefile.am b/src/Makefile.am index 1f32263..4026a15 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -493,6 +493,7 @@ ESX_DRIVER_SOURCES = \ esx/esx_interface_driver.c esx/esx_interface_driver.h \ esx/esx_network_driver.c esx/esx_network_driver.h \ esx/esx_storage_driver.c esx/esx_storage_driver.h \ + esx/esx_storage_backend_vmfs.c esx/esx_storage_backend_vmfs.h \ esx/esx_device_monitor.c esx/esx_device_monitor.h \ esx/esx_secret_driver.c esx/esx_secret_driver.h \ esx/esx_nwfilter_driver.c esx/esx_nwfilter_driver.h \ diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9a765d8..1c9934c 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1981,7 +1981,8 @@ virStoragePoolList(virConnectPtr conn, if (pools) { if (!(pool = virGetStoragePool(conn, poolobj->def->name, - poolobj->def->uuid))) { + poolobj->def->uuid, + NULL, NULL))) { virStoragePoolObjUnlock(poolobj); goto cleanup; } diff --git a/src/datatypes.c b/src/datatypes.c index ff7c524..eab7500 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -379,6 +379,8 @@ virInterfaceDispose(void *obj) * @conn: the hypervisor connection * @name: pointer to the storage pool name * @uuid: pointer to the uuid + * @void*: pointer to driver specific privateData + * @virFreeCallback: cleanup function pointer specfic to driver * * Lookup if the storage pool is already registered for that connection, * if yes return a new pointer to it, if no allocate a new structure, @@ -389,7 +391,8 @@ virInterfaceDispose(void *obj) */ virStoragePoolPtr virGetStoragePool(virConnectPtr conn, const char *name, - const unsigned char *uuid) + const unsigned char *uuid, + void *privateData, virFreeCallback func) { virStoragePoolPtr ret = NULL; @@ -412,6 +415,10 @@ virGetStoragePool(virConnectPtr conn, const char *name, ret->conn = virObjectRef(conn); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); + /* set the driver specific data */ + ret->privateData = privateData; + ret->privateDataFreeFunc = func; + return ret; no_memory: @@ -444,6 +451,10 @@ virStoragePoolDispose(void *obj) VIR_FREE(pool->name); virObjectUnref(pool->conn); + + if (pool->privateDataFreeFunc) { + pool->privateDataFreeFunc(pool->privateData); + } } @@ -453,6 +464,8 @@ virStoragePoolDispose(void *obj) * @pool: pool owning the volume * @name: pointer to the storage vol name * @key: pointer to unique key of the volume + * @void*: pointer to driver specific privateData + * @virFreeCallback: cleanup function pointer specfic to driver * * Lookup if the storage vol is already registered for that connection, * if yes return a new pointer to it, if no allocate a new structure, @@ -463,7 +476,7 @@ virStoragePoolDispose(void *obj) */ virStorageVolPtr virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, - const char *key) + const char *key, void *privateData, virFreeCallback func) { virStorageVolPtr ret = NULL; @@ -489,6 +502,10 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, ret->conn = virObjectRef(conn); + /* set driver specific data */ + ret->privateData = privateData; + ret->privateDataFreeFunc = func; + return ret; no_memory: @@ -520,6 +537,10 @@ virStorageVolDispose(void *obj) VIR_FREE(vol->name); VIR_FREE(vol->pool); virObjectUnref(vol->conn); + + if (vol->privateDataFreeFunc) { + vol->privateDataFreeFunc(vol->privateData); + } } diff --git a/src/datatypes.h b/src/datatypes.h index e4c8262..264d9f6 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -196,6 +196,13 @@ struct _virStoragePool { virConnectPtr conn; /* pointer back to the connection */ char *name; /* the storage pool external name */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the storage pool unique identifier */ + + /* Private data pointer which can be used by driver as they wish + * Cleanup function pointer can be hooked to provide custom cleanup + * operation. + */ + void *privateData; + virFreeCallback privateDataFreeFunc; }; /** @@ -209,6 +216,13 @@ struct _virStorageVol { char *pool; /* Pool name of owner */ char *name; /* the storage vol external name */ char *key; /* unique key for storage vol */ + + /* Private data pointer which can be used by driver as they wish + * Cleanup function pointer can be hooked to provide custom cleanup + * operation. + */ + void *privateData; + virFreeCallback privateDataFreeFunc; }; /** @@ -293,12 +307,16 @@ virInterfacePtr virGetInterface(virConnectPtr conn, const char *name, const char *mac); virStoragePoolPtr virGetStoragePool(virConnectPtr conn, - const char *name, - const unsigned char *uuid); + const char *name, + const unsigned char *uuid, + void *privateData, + virFreeCallback func); virStorageVolPtr virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, - const char *key); + const char *key, + void *privateData, + virFreeCallback func); virNodeDevicePtr virGetNodeDevice(virConnectPtr conn, const char *name); virSecretPtr virGetSecret(virConnectPtr conn, diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 56f31bb..0374a98 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -163,7 +163,8 @@ esxParseVMXFileName(const char *fileName, void *opaque) datastoreName = NULL; if (esxVI_LookupDatastoreHostMount(data->ctx, datastore->obj, - &hostMount) < 0 || + &hostMount, + esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetStringValue(datastore, "summary.name", &datastoreName, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; @@ -307,7 +308,8 @@ esxFormatVMXFileName(const char *fileName, void *opaque) if (esxVI_LookupDatastoreByName(data->ctx, datastoreName, NULL, &datastore, esxVI_Occurrence_RequiredItem) < 0 || esxVI_LookupDatastoreHostMount(data->ctx, datastore->obj, - &hostMount) < 0) { + &hostMount, + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c new file mode 100644 index 0000000..d934e57 --- /dev/null +++ b/src/esx/esx_storage_backend_vmfs.c @@ -0,0 +1,1491 @@ + +/* + * esx_storage_backend_vmfs.c: ESX backend storage driver for + * managing VMFS datastores + * + * Copyright (C) 2012 Ata E Husain Bohra <ata.husain(a)hotmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include <string.h> +#include <stdio.h> +#include <unistd.h> + +#include "internal.h" +#include "md5.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" + +#include "storage_conf.h" +#include "storage_file.h" +#include "esx_storage_backend_vmfs.h" +#include "esx_private.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_STORAGE + +/* + * The UUID of a storage pool is the MD5 sum of it's mount path. Therefore, + * verify that UUID and MD5 sum match in size, because we rely on that. + */ +verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); + + + +static int +esxStorageBackendVMFSPoolLookupType(virConnectPtr conn, const char *poolName, + int *poolType) +{ + int result = -1; + esxPrivate *priv = conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_DatastoreInfo *datastoreInfo = NULL; + + if (esxVI_String_AppendValueToList(&propertyNameList, "info") < 0 || + esxVI_LookupDatastoreByName(priv->primary, poolName, + propertyNameList, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (datastore == NULL) { + /* not found, let the base driver handle the error reporting */ + goto cleanup; + } + + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "info")) { + if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, + &datastoreInfo) < 0) { + goto cleanup; + } + + break; + } + } + + if (esxVI_LocalDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { + *poolType = VIR_STORAGE_POOL_DIR; + } else if (esxVI_NasDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { + *poolType = VIR_STORAGE_POOL_NETFS; + } else if (esxVI_VmfsDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { + *poolType = VIR_STORAGE_POOL_FS; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("DatastoreInfo has unexpected type")); + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreInfo_Free(&datastoreInfo); + + return result; +} + + + + +static int +esxStorageBackendVMFSNumberOfStoragePools(virConnectPtr conn) +{ + esxPrivate *priv = conn->storagePrivateData; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *datastore = NULL; + int count = 0; + + if (esxVI_LookupDatastoreList(priv->primary, NULL, &datastoreList) < 0) { + goto cleanup; + } + + for (datastore = datastoreList; datastore != NULL; + datastore = datastore->_next) { + ++count; + } + + cleanup: + esxVI_ObjectContent_Free(&datastoreList); + + return count; +} + +static int +esxStorageBackendVMFSListStoragePools(virConnectPtr conn, + char **const names, + const int maxnames) +{ + esxPrivate *priv = conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *datastore = NULL; + int count = 0; + int i = 0; + bool success = false; + + if (maxnames == 0) { + return 0; + } + + if (esxVI_String_AppendValueToList(&propertyNameList, + "summary.name") < 0 || + esxVI_LookupDatastoreList(priv->primary, propertyNameList, + &datastoreList) < 0) { + goto cleanup; + } + + for (datastore = datastoreList; datastore != NULL; + datastore = datastore->_next) { + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "summary.name")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_String) < 0) { + goto cleanup; + } + + names[count] = strdup(dynamicProperty->val->string); + + if (names[count] == NULL) { + virReportOOMError(); + goto cleanup; + } + + ++count; + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + } + + success = true; + + cleanup: + if (! success) { + for (i = 0; i < count; ++i) { + VIR_FREE(names[i]); + } + + count = -1; + } + + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastoreList); + + return count; +} + +static virStoragePoolPtr +esxStorageBackendVMFSPoolLookupByName(virConnectPtr conn, + const char *name) +{ + esxPrivate *priv = conn->storagePrivateData; + esxVI_ObjectContent *datastore = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; + /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + unsigned char md5[MD5_DIGEST_SIZE]; + virStoragePoolPtr pool = NULL; + + virCheckNonNullArgReturn(name, NULL); + + if (esxVI_LookupDatastoreByName(priv->primary, name, NULL, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (datastore == NULL) { + /* not found, let the base driver handle the error reporting */ + goto cleanup; + } + + /* + * Datastores don't have a UUID, but we can use the 'host.mountInfo.path' + * property as source for a UUID. The mount path is unique per host and + * cannot change during the lifetime of the datastore. + * + * The MD5 sum of the mount path can be used as UUID, assuming MD5 is + * considered to be collision-free enough for this use case. + */ + if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount, esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (hostMount == NULL) { + /* routine called by base storage driver to determine correct backend + * driver, leave error reporting to the base driver + */ + goto cleanup; + } + + md5_buffer(hostMount->mountInfo->path, + strlen(hostMount->mountInfo->path), md5); + + pool = virGetStoragePool(conn, name, md5, + &esxStorageBackendVMFSDrv, NULL); + + cleanup: + esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreHostMount_Free(&hostMount); + + return pool; +} + +static virStoragePoolPtr +esxStorageBackendVMFSPoolLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) +{ + esxPrivate *priv = conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; + unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + char *name = NULL; + virStoragePoolPtr pool = NULL; + + + if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || + esxVI_LookupDatastoreList(priv->primary, propertyNameList, + &datastoreList) < 0) { + goto cleanup; + } + + for (datastore = datastoreList; datastore != NULL; + datastore = datastore->_next) { + esxVI_DatastoreHostMount_Free(&hostMount); + if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount, esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (hostMount == NULL) { + /* it may happen that the storage pool belong to non VMFS type, + * leave error reporting to the base storage driver. + */ + goto cleanup; + } + + md5_buffer(hostMount->mountInfo->path, + strlen(hostMount->mountInfo->path), md5); + + if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) { + break; + } + } + + if (datastore == NULL) { + goto cleanup; + } + + if (esxVI_GetStringValue(datastore, "summary.name", &name, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + pool = virGetStoragePool(conn, name, uuid, + &esxStorageBackendVMFSDrv, NULL); + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastoreList); + esxVI_DatastoreHostMount_Free(&hostMount); + + return pool; +} + +static int +esxStorageBackendVMFSPoolRefresh(virStoragePoolPtr pool, unsigned int flags) +{ + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_ObjectContent *datastore = NULL; + int result = -1; + + virCheckFlags(0, -1); + + if (esxVI_LookupDatastoreByName(priv->primary, pool->name, NULL, &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_RefreshDatastore(priv->primary, datastore->obj) < 0) { + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_ObjectContent_Free(&datastore); + + return result; +} + + +static int +esxStorageBackendVMFSPoolGetInfo(virStoragePoolPtr pool, + virStoragePoolInfoPtr info) +{ + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_Boolean accessible = esxVI_Boolean_Undefined; + int result = -1; + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "summary.accessible\0" + "summary.capacity\0" + "summary.freeSpace\0") < 0 || + esxVI_LookupDatastoreByName(priv->primary, pool->name, + propertyNameList, &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetBoolean(datastore, "summary.accessible", + &accessible, esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + if (accessible == esxVI_Boolean_True) { + info->state = VIR_STORAGE_POOL_RUNNING; + + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "summary.capacity")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_Long) < 0) { + goto cleanup; + } + + info->capacity = dynamicProperty->val->int64; + } else if (STREQ(dynamicProperty->name, "summary.freeSpace")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_Long) < 0) { + goto cleanup; + } + + info->available = dynamicProperty->val->int64; + } + } + + info->allocation = info->capacity - info->available; + } else { + info->state = VIR_STORAGE_POOL_INACCESSIBLE; + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + + return result; +} + +static char * +esxStorageBackendVMFSPoolGetXMLDesc(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_NasDatastoreInfo *nasInfo = NULL; + char *xml = NULL; + + virCheckFlags(0, NULL); + + memset(&def, 0, sizeof(def)); + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "summary.accessible\0" + "summary.capacity\0" + "summary.freeSpace\0" + "info\0") < 0 || + esxVI_LookupDatastoreByName(priv->primary, pool->name, + propertyNameList, &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetBoolean(datastore, "summary.accessible", + &accessible, esxVI_Occurrence_RequiredItem) < 0 || + esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount, esxVI_Occurrence_RequiredItem) < 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) { + if (STREQ(dynamicProperty->name, "summary.capacity")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_Long) < 0) { + goto cleanup; + } + + def.capacity = dynamicProperty->val->int64; + } else if (STREQ(dynamicProperty->name, "summary.freeSpace")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_Long) < 0) { + goto cleanup; + } + + def.available = dynamicProperty->val->int64; + } + } + + def.allocation = def.capacity - def.available; + } + + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "info")) { + if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, + &info) < 0) { + goto cleanup; + } + + 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) { + if (VIR_ALLOC_N(def.source.hosts, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + def.type = VIR_STORAGE_POOL_NETFS; + def.source.hosts[0].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 { + virReportError(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 { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("DatastoreInfo has unexpected type")); + goto cleanup; + } + + xml = virStoragePoolDefFormat(&def); + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreHostMount_Free(&hostMount); + esxVI_DatastoreInfo_Free(&info); + + return xml; +} + + +static int +esxStorageBackendVMFSPoolNumberOfStorageVolumes(virStoragePoolPtr pool) +{ + bool success = false; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + esxVI_FileInfo *fileInfo = NULL; + int count = 0; + + if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, + &searchResultsList) < 0) { + goto cleanup; + } + + /* Interpret search result */ + for (searchResults = searchResultsList; searchResults != NULL; + searchResults = searchResults->_next) { + for (fileInfo = searchResults->file; fileInfo != NULL; + fileInfo = fileInfo->_next) { + ++count; + } + } + + success = true; + + cleanup: + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); + + return success ? count : -1; +} + +static int +esxStorageBackendVMFSPoolListStorageVolumes(virStoragePoolPtr pool, + char **const names, + int maxnames) + +{ + bool success = false; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + esxVI_FileInfo *fileInfo = NULL; + char *directoryAndFileName = NULL; + size_t length; + int count = 0; + int i; + + if (names == NULL || maxnames < 0) { + virReportError(VIR_ERR_INVALID_ARG, "%s", _("Invalid argument")); + return -1; + } + + if (maxnames == 0) { + return 0; + } + + if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, + &searchResultsList) < 0) { + goto cleanup; + } + + /* Interpret search result */ + for (searchResults = searchResultsList; searchResults != NULL; + searchResults = searchResults->_next) { + VIR_FREE(directoryAndFileName); + + if (esxUtil_ParseDatastorePath(searchResults->folderPath, NULL, NULL, + &directoryAndFileName) < 0) { + goto cleanup; + } + + /* Strip trailing separators */ + length = strlen(directoryAndFileName); + + while (length > 0 && directoryAndFileName[length - 1] == '/') { + directoryAndFileName[length - 1] = '\0'; + --length; + } + + /* Build volume names */ + for (fileInfo = searchResults->file; fileInfo != NULL; + fileInfo = fileInfo->_next) { + if (length < 1) { + names[count] = strdup(fileInfo->path); + + if (names[count] == NULL) { + virReportOOMError(); + goto cleanup; + } + } else if (virAsprintf(&names[count], "%s/%s", directoryAndFileName, + fileInfo->path) < 0) { + virReportOOMError(); + goto cleanup; + } + + ++count; + } + } + + success = true; + + cleanup: + if (! success) { + for (i = 0; i < count; ++i) { + VIR_FREE(names[i]); + } + + count = -1; + } + + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); + VIR_FREE(directoryAndFileName); + + return count; + +} + +static virStorageVolPtr +esxStorageBackendVMFSVolumeLookupByName(virStoragePoolPtr pool, + const char *name) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + char *datastorePath = NULL; + char *key = NULL; + + if (virAsprintf(&datastorePath, "[%s] %s", pool->name, name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, + datastorePath, &key) < 0) { + goto cleanup; + } + + volume = virGetStorageVol(pool->conn, pool->name, name, key, + &esxStorageBackendVMFSDrv, NULL); + + cleanup: + VIR_FREE(datastorePath); + VIR_FREE(key); + + return volume; +} + +static virStorageVolPtr +esxStorageBackendVMFSVolumeLookupByPath(virConnectPtr conn, const char *path) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = conn->storagePrivateData; + char *datastoreName = NULL; + char *directoryAndFileName = NULL; + char *key = NULL; + + if (esxUtil_ParseDatastorePath(path, &datastoreName, NULL, + &directoryAndFileName) < 0) { + goto cleanup; + } + + if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, path, + &key) < 0) { + goto cleanup; + } + + volume = virGetStorageVol(conn, datastoreName, directoryAndFileName, key, + &esxStorageBackendVMFSDrv, NULL); + + cleanup: + VIR_FREE(datastoreName); + VIR_FREE(directoryAndFileName); + VIR_FREE(key); + + return volume; +} + + + +static virStorageVolPtr +esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *datastore = NULL; + char *datastoreName = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + char *directoryAndFileName = NULL; + size_t length; + char *datastorePath = NULL; + char *volumeName = NULL; + esxVI_FileInfo *fileInfo = NULL; + char *uuid_string = NULL; + char key_candidate[VIR_UUID_STRING_BUFLEN] = ""; + + if (STRPREFIX(key, "[")) { + /* Key is probably a datastore path */ + return esxStorageBackendVMFSVolumeLookupByPath(conn, key); + } + + if (!priv->primary->hasQueryVirtualDiskUuid) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("QueryVirtualDiskUuid not available, " + "cannot lookup storage volume by UUID")); + return NULL; + } + + /* Lookup all datastores */ + if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || + esxVI_LookupDatastoreList(priv->primary, propertyNameList, + &datastoreList) < 0) { + goto cleanup; + } + + for (datastore = datastoreList; datastore != NULL; + datastore = datastore->_next) { + datastoreName = NULL; + + if (esxVI_GetStringValue(datastore, "summary.name", &datastoreName, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + /* Lookup datastore content */ + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); + + if (esxVI_LookupDatastoreContentByDatastoreName + (priv->primary, datastoreName, &searchResultsList) < 0) { + goto cleanup; + } + + /* Interpret search result */ + for (searchResults = searchResultsList; searchResults != NULL; + searchResults = searchResults->_next) { + VIR_FREE(directoryAndFileName); + + if (esxUtil_ParseDatastorePath(searchResults->folderPath, NULL, + NULL, &directoryAndFileName) < 0) { + goto cleanup; + } + + /* Strip trailing separators */ + length = strlen(directoryAndFileName); + + while (length > 0 && directoryAndFileName[length - 1] == '/') { + directoryAndFileName[length - 1] = '\0'; + --length; + } + + /* Build datastore path and query the UUID */ + for (fileInfo = searchResults->file; fileInfo != NULL; + fileInfo = fileInfo->_next) { + VIR_FREE(datastorePath); + + if (length < 1) { + if (virAsprintf(&volumeName, "%s", + fileInfo->path) < 0) { + virReportOOMError(); + goto cleanup; + } + } else if (virAsprintf(&volumeName, "%s/%s", + directoryAndFileName, + fileInfo->path) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, + volumeName) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_VmDiskFileInfo_DynamicCast(fileInfo) == NULL) { + /* Only a VirtualDisk has a UUID */ + continue; + } + + VIR_FREE(uuid_string); + + if (esxVI_QueryVirtualDiskUuid + (priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &uuid_string) < 0) { + goto cleanup; + } + + if (esxUtil_ReformatUuid(uuid_string, key_candidate) < 0) { + goto cleanup; + } + + if (STREQ(key, key_candidate)) { + /* Found matching UUID */ + volume = virGetStorageVol(conn, datastoreName, + volumeName, key, + &esxStorageBackendVMFSDrv, + NULL); + goto cleanup; + } + } + } + } + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastoreList); + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); + VIR_FREE(directoryAndFileName); + VIR_FREE(datastorePath); + VIR_FREE(volumeName); + VIR_FREE(uuid_string); + + return volume; +} + +static virStorageVolPtr +esxStorageBackendVMFSVolumeCreateXML(virStoragePoolPtr pool, + const char *xmldesc, + unsigned int flags) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + virStoragePoolDef poolDef; + virStorageVolDefPtr def = NULL; + char *tmp; + char *unescapedDatastorePath = NULL; + char *unescapedDirectoryName = NULL; + char *unescapedDirectoryAndFileName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *datastorePathWithoutFileName = NULL; + char *datastorePath = NULL; + esxVI_FileInfo *fileInfo = NULL; + esxVI_FileBackedVirtualDiskSpec *virtualDiskSpec = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + char *uuid_string = NULL; + char *key = NULL; + + virCheckFlags(0, NULL); + + memset(&poolDef, 0, sizeof(poolDef)); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (esxStorageBackendVMFSPoolLookupType( + pool->conn, pool->name, &poolDef.type) < 0) { + return NULL; + } + + /* Parse config */ + def = virStorageVolDefParseString(&poolDef, xmldesc); + + if (def == NULL) { + goto cleanup; + } + + if (def->type != VIR_STORAGE_VOL_FILE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Creating non-file volumes is not supported")); + goto cleanup; + } + + /* Validate config */ + tmp = strrchr(def->name, '/'); + + if (tmp == NULL || *def->name == '/' || tmp[1] == '\0') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume name '%s' doesn't have expected format " + "'<directory>/<file>'"), def->name); + goto cleanup; + } + + if (! virFileHasSuffix(def->name, ".vmdk")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume name '%s' has unsupported suffix, " + "expecting '.vmdk'"), def->name); + goto cleanup; + } + + if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, + def->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (def->target.format == VIR_STORAGE_FILE_VMDK) { + /* Parse and escape datastore path */ + if (esxUtil_ParseDatastorePath(unescapedDatastorePath, NULL, + &unescapedDirectoryName, + &unescapedDirectoryAndFileName) < 0) { + goto cleanup; + } + + directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); + + if (directoryName == NULL) { + goto cleanup; + } + + fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + + strlen(unescapedDirectoryName) + 1); + + if (fileName == NULL) { + goto cleanup; + } + + if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, + directoryName) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, + fileName) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Create directory, if it doesn't exist yet */ + if (esxVI_LookupFileInfoByDatastorePath + (priv->primary, datastorePathWithoutFileName, true, &fileInfo, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (fileInfo == NULL) { + if (esxVI_MakeDirectory(priv->primary, datastorePathWithoutFileName, + priv->primary->datacenter->_reference, + esxVI_Boolean_True) < 0) { + goto cleanup; + } + } + + /* Create VirtualDisk */ + if (esxVI_FileBackedVirtualDiskSpec_Alloc(&virtualDiskSpec) < 0 || + esxVI_Long_Alloc(&virtualDiskSpec->capacityKb) < 0) { + goto cleanup; + } + + /* From the vSphere API documentation about VirtualDiskType ... */ + if (def->allocation == def->capacity) { + /* + * "A preallocated disk has all space allocated at creation time + * and the space is zeroed on demand as the space is used." + */ + virtualDiskSpec->diskType = (char *)"preallocated"; + } else if (def->allocation == 0) { + /* + * "Space required for thin-provisioned virtual disk is allocated + * and zeroed on demand as the space is used." + */ + virtualDiskSpec->diskType = (char *)"thin"; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unsupported capacity-to-allocation relation")); + goto cleanup; + } + + /* + * FIXME: The adapter type is a required parameter, but there is no + * way to let the user specify it in the volume XML config. Therefore, + * default to 'busLogic' here. + */ + virtualDiskSpec->adapterType = (char *)"busLogic"; + + virtualDiskSpec->capacityKb->value = + VIR_DIV_UP(def->capacity, 1024); /* Scale from byte to kilobyte */ + + if (esxVI_CreateVirtualDisk_Task + (priv->primary, datastorePath, + priv->primary->datacenter->_reference, + esxVI_VirtualDiskSpec_DynamicCast(virtualDiskSpec), &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, + priv->parsedUri->autoAnswer, + &taskInfoState, + &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not create volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + if (priv->primary->hasQueryVirtualDiskUuid) { + if (VIR_ALLOC_N(key, VIR_UUID_STRING_BUFLEN) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_QueryVirtualDiskUuid(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &uuid_string) < 0) { + goto cleanup; + } + + if (esxUtil_ReformatUuid(uuid_string, key) < 0) { + goto cleanup; + } + } else { + /* Fall back to the path as key */ + if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { + goto cleanup; + } + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Creation of %s volumes is not supported"), + virStorageFileFormatTypeToString(def->target.format)); + goto cleanup; + } + + volume = virGetStorageVol(pool->conn, pool->name, def->name, key, + &esxStorageBackendVMFSDrv, NULL); + + cleanup: + if (virtualDiskSpec != NULL) { + virtualDiskSpec->diskType = NULL; + virtualDiskSpec->adapterType = NULL; + } + + virStorageVolDefFree(def); + VIR_FREE(unescapedDatastorePath); + VIR_FREE(unescapedDirectoryName); + VIR_FREE(unescapedDirectoryAndFileName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(datastorePathWithoutFileName); + VIR_FREE(datastorePath); + esxVI_FileInfo_Free(&fileInfo); + esxVI_FileBackedVirtualDiskSpec_Free(&virtualDiskSpec); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + VIR_FREE(uuid_string); + VIR_FREE(key); + + return volume; +} + +static virStorageVolPtr +esxStorageBackendVMFSVolumeCreateXMLFrom(virStoragePoolPtr pool, + const char *xmldesc, + virStorageVolPtr sourceVolume, + unsigned int flags) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + virStoragePoolDef poolDef; + char *sourceDatastorePath = NULL; + virStorageVolDefPtr def = NULL; + char *tmp; + char *unescapedDatastorePath = NULL; + char *unescapedDirectoryName = NULL; + char *unescapedDirectoryAndFileName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *datastorePathWithoutFileName = NULL; + char *datastorePath = NULL; + esxVI_FileInfo *fileInfo = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + char *uuid_string = NULL; + char *key = NULL; + + virCheckFlags(0, NULL); + + memset(&poolDef, 0, sizeof(poolDef)); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (esxStorageBackendVMFSPoolLookupType( + pool->conn, pool->name, &poolDef.type) < 0) { + return NULL; + } + + if (virAsprintf(&sourceDatastorePath, "[%s] %s", sourceVolume->pool, + sourceVolume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Parse config */ + def = virStorageVolDefParseString(&poolDef, xmldesc); + + if (def == NULL) { + goto cleanup; + } + + if (def->type != VIR_STORAGE_VOL_FILE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Creating non-file volumes is not supported")); + goto cleanup; + } + + /* Validate config */ + tmp = strrchr(def->name, '/'); + + if (tmp == NULL || *def->name == '/' || tmp[1] == '\0') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume name '%s' doesn't have expected format " + "'<directory>/<file>'"), def->name); + goto cleanup; + } + + if (! virFileHasSuffix(def->name, ".vmdk")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume name '%s' has unsupported suffix, " + "expecting '.vmdk'"), def->name); + goto cleanup; + } + + if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, + def->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (def->target.format == VIR_STORAGE_FILE_VMDK) { + /* Parse and escape datastore path */ + if (esxUtil_ParseDatastorePath(unescapedDatastorePath, NULL, + &unescapedDirectoryName, + &unescapedDirectoryAndFileName) < 0) { + goto cleanup; + } + + directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); + + if (directoryName == NULL) { + goto cleanup; + } + + fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + + strlen(unescapedDirectoryName) + 1); + + if (fileName == NULL) { + goto cleanup; + } + + if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, + directoryName) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, + fileName) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Create directory, if it doesn't exist yet */ + if (esxVI_LookupFileInfoByDatastorePath + (priv->primary, datastorePathWithoutFileName, true, &fileInfo, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (fileInfo == NULL) { + if (esxVI_MakeDirectory(priv->primary, datastorePathWithoutFileName, + priv->primary->datacenter->_reference, + esxVI_Boolean_True) < 0) { + goto cleanup; + } + } + + /* Copy VirtualDisk */ + if (esxVI_CopyVirtualDisk_Task(priv->primary, sourceDatastorePath, + priv->primary->datacenter->_reference, + datastorePath, + priv->primary->datacenter->_reference, + NULL, esxVI_Boolean_False, &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, + priv->parsedUri->autoAnswer, + &taskInfoState, + &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not copy volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + if (priv->primary->hasQueryVirtualDiskUuid) { + if (VIR_ALLOC_N(key, VIR_UUID_STRING_BUFLEN) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_QueryVirtualDiskUuid(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &uuid_string) < 0) { + goto cleanup; + } + + if (esxUtil_ReformatUuid(uuid_string, key) < 0) { + goto cleanup; + } + } else { + /* Fall back to the path as key */ + if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { + goto cleanup; + } + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Creation of %s volumes is not supported"), + virStorageFileFormatTypeToString(def->target.format)); + goto cleanup; + } + + volume = virGetStorageVol(pool->conn, pool->name, def->name, key, + &esxStorageBackendVMFSDrv, NULL); + + cleanup: + VIR_FREE(sourceDatastorePath); + virStorageVolDefFree(def); + VIR_FREE(unescapedDatastorePath); + VIR_FREE(unescapedDirectoryName); + VIR_FREE(unescapedDirectoryAndFileName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(datastorePathWithoutFileName); + VIR_FREE(datastorePath); + esxVI_FileInfo_Free(&fileInfo); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + VIR_FREE(uuid_string); + VIR_FREE(key); + + return volume; +} + + + +static char * +esxStorageBackendVMFSVolumeGetXMLDesc(virStorageVolPtr volume, + unsigned int flags) +{ + esxPrivate *priv = volume->conn->storagePrivateData; + virStoragePoolDef pool; + char *datastorePath = NULL; + esxVI_FileInfo *fileInfo = NULL; + esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; + esxVI_IsoImageFileInfo *isoImageFileInfo = NULL; + esxVI_FloppyImageFileInfo *floppyImageFileInfo = NULL; + virStorageVolDef def; + char *xml = NULL; + + virCheckFlags(0, NULL); + + memset(&pool, 0, sizeof(pool)); + memset(&def, 0, sizeof(def)); + + if (esxStorageBackendVMFSPoolLookupType( + volume->conn, volume->pool, &pool.type) < 0) { + return NULL; + } + + /* Lookup file info */ + if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, + false, &fileInfo, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(fileInfo); + isoImageFileInfo = esxVI_IsoImageFileInfo_DynamicCast(fileInfo); + floppyImageFileInfo = esxVI_FloppyImageFileInfo_DynamicCast(fileInfo); + + def.name = volume->name; + + if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, datastorePath, + &def.key) < 0) { + goto cleanup; + } + + def.type = VIR_STORAGE_VOL_FILE; + def.target.path = datastorePath; + + if (vmDiskFileInfo != NULL) { + /* Scale from kilobyte to byte */ + def.capacity = vmDiskFileInfo->capacityKb->value * 1024; + def.allocation = vmDiskFileInfo->fileSize->value; + + def.target.format = VIR_STORAGE_FILE_VMDK; + } else if (isoImageFileInfo != NULL) { + def.capacity = fileInfo->fileSize->value; + def.allocation = fileInfo->fileSize->value; + + def.target.format = VIR_STORAGE_FILE_ISO; + } else if (floppyImageFileInfo != NULL) { + def.capacity = fileInfo->fileSize->value; + def.allocation = fileInfo->fileSize->value; + + def.target.format = VIR_STORAGE_FILE_RAW; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("File '%s' has unknown type"), datastorePath); + goto cleanup; + } + + xml = virStorageVolDefFormat(&pool, &def); + + cleanup: + VIR_FREE(datastorePath); + esxVI_FileInfo_Free(&fileInfo); + VIR_FREE(def.key); + + return xml; +} + + + +static int +esxStorageBackendVMFSVolumeDelete(virStorageVolPtr volume, unsigned int flags) +{ + int result = -1; + esxPrivate *priv = volume->conn->storagePrivateData; + char *datastorePath = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + + virCheckFlags(0, -1); + + if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_DeleteVirtualDisk_Task(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, + priv->parsedUri->autoAnswer, + &taskInfoState, &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not delete volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + result = 0; + + cleanup: + VIR_FREE(datastorePath); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + + return result; + +} + + + +static int +esxStorageBackendVMFSVolumeWipe(virStorageVolPtr volume, unsigned int flags) +{ + int result = -1; + esxPrivate *priv = volume->conn->storagePrivateData; + char *datastorePath = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + + virCheckFlags(0, -1); + + if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_ZeroFillVirtualDisk_Task(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, + priv->parsedUri->autoAnswer, + &taskInfoState, &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not wipe volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + result = 0; + + cleanup: + VIR_FREE(datastorePath); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + + return result; + +} + + +static char* +esxStorageBackendVMFSVolumeGetPath(virStorageVolPtr volume) +{ + char *path; + + if (virAsprintf(&path, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + return NULL; + } + + return path; + +} + + + + +virStorageDriver esxStorageBackendVMFSDrv = { + .name = "ESX VMFS backend", + .open = NULL, /* 1.0.0 */ + .close = NULL, /* 1.0.0 */ + .numOfPools = esxStorageBackendVMFSNumberOfStoragePools, /* 1.0.0 */ + .listPools = esxStorageBackendVMFSListStoragePools, /* 1.0.0 */ + .poolLookupByName = esxStorageBackendVMFSPoolLookupByName, /* 1.0.0 */ + .poolLookupByUUID = esxStorageBackendVMFSPoolLookupByUUID, /* 1.0.0 */ + .poolRefresh = esxStorageBackendVMFSPoolRefresh, /* 1.0.0 */ + .poolGetInfo = esxStorageBackendVMFSPoolGetInfo, /* 1.0.0 */ + .poolGetXMLDesc = esxStorageBackendVMFSPoolGetXMLDesc, /* 1.0.0 */ + .poolNumOfVolumes = esxStorageBackendVMFSPoolNumberOfStorageVolumes, /* 1.0.0 */ + .poolListVolumes = esxStorageBackendVMFSPoolListStorageVolumes, /* 1.0.0 */ + .volLookupByName = esxStorageBackendVMFSVolumeLookupByName, /* 1.0.0 */ + .volLookupByKey = esxStorageBackendVMFSVolumeLookupByKey, /* 1.0.0 */ + .volLookupByPath = esxStorageBackendVMFSVolumeLookupByPath, /* 1.0.0 */ + .volCreateXML = esxStorageBackendVMFSVolumeCreateXML, /* 1.0.0 */ + .volCreateXMLFrom = esxStorageBackendVMFSVolumeCreateXMLFrom, /* 1.0.0 */ + .volGetXMLDesc = esxStorageBackendVMFSVolumeGetXMLDesc, /* 1.0.0 */ + .volDelete = esxStorageBackendVMFSVolumeDelete, /* 1.0.0 */ + .volWipe = esxStorageBackendVMFSVolumeWipe, /* 1.0.0 */ + .volGetPath = esxStorageBackendVMFSVolumeGetPath, /* 1.0.0 */ + +}; diff --git a/src/esx/esx_storage_backend_vmfs.h b/src/esx/esx_storage_backend_vmfs.h new file mode 100644 index 0000000..d48a519 --- /dev/null +++ b/src/esx/esx_storage_backend_vmfs.h @@ -0,0 +1,30 @@ +/* + * esx_storage_backend_vmfs.h: ESX storage backend for VMFS datastores + * + * Copyright (C) 2012 Ata E Husain Bohra <ata.husain(a)hotmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#ifndef __ESX_STORAGE_BACKEND_VMFS_H__ +# define __ESX_STORAGE_BACKEND_VMFS_H__ + +# include "driver.h" + +extern virStorageDriver esxStorageBackendVMFSDrv; + +#endif /* __ESX_STORAGE_BACKEND_VMFS_H__ */ + diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 08d5ab1..5530ea7 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -5,6 +5,7 @@ * * Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2012 Ata E Husain Bohra <ata.husain(a)hotmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,82 +25,29 @@ #include <config.h> -#include "md5.h" -#include "verify.h" -#include "internal.h" -#include "util.h" -#include "memory.h" -#include "logging.h" #include "uuid.h" +#include "memory.h" #include "storage_conf.h" -#include "storage_file.h" #include "esx_private.h" #include "esx_storage_driver.h" -#include "esx_vi.h" -#include "esx_vi_methods.h" -#include "esx_util.h" +#include "esx_storage_backend_vmfs.h" #define VIR_FROM_THIS VIR_FROM_ESX -/* - * The UUID of a storage pool is the MD5 sum of it's mount path. Therefore, - * verify that UUID and MD5 sum match in size, because we rely on that. - */ -verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); - - - -static int -esxStoragePoolLookupType(esxVI_Context *ctx, const char *poolName, - int *poolType) -{ - int result = -1; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastore = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_DatastoreInfo *datastoreInfo = NULL; - - if (esxVI_String_AppendValueToList(&propertyNameList, "info") < 0 || - esxVI_LookupDatastoreByName(ctx, poolName, propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } - - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "info")) { - if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, - &datastoreInfo) < 0) { - goto cleanup; - } - - break; - } - } - - if (esxVI_LocalDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { - *poolType = VIR_STORAGE_POOL_DIR; - } else if (esxVI_NasDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { - *poolType = VIR_STORAGE_POOL_NETFS; - } else if (esxVI_VmfsDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { - *poolType = VIR_STORAGE_POOL_FS; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("DatastoreInfo has unexpected type")); - goto cleanup; - } - - result = 0; - - cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); - esxVI_DatastoreInfo_Free(&datastoreInfo); - - return result; -} - +/** +* ESX storage driver implements a facade pattern; +* the driver exposes the routines supported by Libvirt +* public interface to manage ESX storage devices. Internally +* it uses backend drivers to perform the required task. +*/ +enum { + VMFS = 0, + LAST_DRIVER +}; +static virStorageDriverPtr backendDrv[] = { + &esxStorageBackendVMFSDrv +}; static virDrvOpenStatus esxStorageOpen(virConnectPtr conn, @@ -132,27 +80,28 @@ esxStorageClose(virConnectPtr conn) static int esxNumberOfStoragePools(virConnectPtr conn) { - int count = 0; esxPrivate *priv = conn->storagePrivateData; - esxVI_ObjectContent *datastoreList = NULL; - esxVI_ObjectContent *datastore = NULL; + int count = 0; + int i = 0; + bool success = false; if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; + goto cleanup; } - if (esxVI_LookupDatastoreList(priv->primary, NULL, &datastoreList) < 0) { - return -1; + for (i = 0; i < LAST_DRIVER; ++i) { + int tempCount = backendDrv[i]->numOfPools(conn); + if (tempCount < 0) { + goto cleanup; + } + count += tempCount; } - for (datastore = datastoreList; datastore != NULL; - datastore = datastore->_next) { - ++count; - } + success = true; - esxVI_ObjectContent_Free(&datastoreList); + cleanup: - return count; + return success ? count : -1; } @@ -162,56 +111,32 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) { bool success = false; esxPrivate *priv = conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_ObjectContent *datastoreList = NULL; - esxVI_ObjectContent *datastore = NULL; int count = 0; - int i; + int i = 0; if (maxnames == 0) { return 0; } if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; - } - - if (esxVI_String_AppendValueToList(&propertyNameList, - "summary.name") < 0 || - esxVI_LookupDatastoreList(priv->primary, propertyNameList, - &datastoreList) < 0) { goto cleanup; } - for (datastore = datastoreList; datastore != NULL; - datastore = datastore->_next) { - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.name")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { - goto cleanup; - } - - names[count] = strdup(dynamicProperty->val->string); - - if (names[count] == NULL) { - virReportOOMError(); - goto cleanup; - } - - ++count; - break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); - } + for (i = 0; i < LAST_DRIVER; ++i) { + int tempCount = + backendDrv[i]->listPools(conn, &names[count], maxnames-count); + + if (tempCount < 0) { + goto cleanup; } + + count += tempCount; } success = true; cleanup: + if (! success) { for (i = 0; i < count; ++i) { VIR_FREE(names[i]); @@ -220,10 +145,8 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) count = -1; } - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastoreList); - return count; + } @@ -252,43 +175,31 @@ static virStoragePoolPtr esxStoragePoolLookupByName(virConnectPtr conn, const char *name) { esxPrivate *priv = conn->storagePrivateData; - esxVI_ObjectContent *datastore = NULL; - esxVI_DatastoreHostMount *hostMount = NULL; - unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ virStoragePoolPtr pool = NULL; + int i = 0; - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } + virCheckNonNullArgGoto(name, cleanup); - if (esxVI_LookupDatastoreByName(priv->primary, name, NULL, &datastore, - esxVI_Occurrence_RequiredItem) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - /* - * Datastores don't have a UUID, but we can use the 'host.mountInfo.path' - * property as source for a UUID. The mount path is unique per host and - * cannot change during the lifetime of the datastore. - * - * The MD5 sum of the mount path can be used as UUID, assuming MD5 is - * considered to be collision-free enough for this use case. - */ - if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, - &hostMount) < 0) { - goto cleanup; + for (i = 0; i < LAST_DRIVER; ++i) { + pool = backendDrv[i]->poolLookupByName(conn, name); + if (pool != NULL) { + break; + } } - md5_buffer(hostMount->mountInfo->path, - strlen(hostMount->mountInfo->path), md5); - - pool = virGetStoragePool(conn, name, md5); + if (pool == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find storage pool with name '%s'"), name); + } - cleanup: - esxVI_ObjectContent_Free(&datastore); - esxVI_DatastoreHostMount_Free(&hostMount); +cleanup: return pool; + } @@ -297,65 +208,36 @@ static virStoragePoolPtr esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { esxPrivate *priv = conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastoreList = NULL; - esxVI_ObjectContent *datastore = NULL; - esxVI_DatastoreHostMount *hostMount = NULL; - unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ - char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; - char *name = NULL; virStoragePoolPtr pool = NULL; + char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; + int i = 0; - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } + virCheckNonNullArgGoto(uuid, cleanup); - if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupDatastoreList(priv->primary, propertyNameList, - &datastoreList) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - for (datastore = datastoreList; datastore != NULL; - datastore = datastore->_next) { - esxVI_DatastoreHostMount_Free(&hostMount); - - if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, - &hostMount) < 0) { - goto cleanup; - } - - md5_buffer(hostMount->mountInfo->path, - strlen(hostMount->mountInfo->path), md5); - - if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) { + /* invoke backend drive method to search all known pools */ + for (i = 0; i < LAST_DRIVER; ++i) { + pool = backendDrv[i]->poolLookupByUUID(conn, uuid); + if (pool != NULL) { break; } } - if (datastore == NULL) { + if (pool == NULL) { virUUIDFormat(uuid, uuid_string); virReportError(VIR_ERR_NO_STORAGE_POOL, - _("Could not find datastore with UUID '%s'"), - uuid_string); - - goto cleanup; - } - - if (esxVI_GetStringValue(datastore, "summary.name", &name, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; + _("Could not find storage pool with uuid '%s'"), + uuid_string); } - pool = virGetStoragePool(conn, name, uuid); - - cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastoreList); - esxVI_DatastoreHostMount_Free(&hostMount); +cleanup: return pool; + } @@ -373,26 +255,26 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) { int result = -1; esxPrivate *priv = pool->conn->storagePrivateData; - esxVI_ObjectContent *datastore = NULL; + virStorageDriverPtr backendDrvPtr = NULL; - virCheckFlags(0, -1); + virCheckNonNullArgGoto(pool->privateData, cleanup); if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; + goto cleanup; } - if (esxVI_LookupDatastoreByName(priv->primary, pool->name, NULL, &datastore, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_RefreshDatastore(priv->primary, datastore->obj) < 0) { + backendDrvPtr = (virStorageDriverPtr) pool->privateData; + + if (backendDrvPtr->poolRefresh(pool, flags) < 0) { goto cleanup; } result = 0; cleanup: - esxVI_ObjectContent_Free(&datastore); return result; + } @@ -402,63 +284,28 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info) { int result = -1; esxPrivate *priv = pool->conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastore = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_Boolean accessible = esxVI_Boolean_Undefined; + virStorageDriverPtr backendDrvPtr = NULL; + + virCheckNonNullArgGoto(pool->privateData, cleanup); memset(info, 0, sizeof(*info)); if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; - } - - if (esxVI_String_AppendValueListToList(&propertyNameList, - "summary.accessible\0" - "summary.capacity\0" - "summary.freeSpace\0") < 0 || - esxVI_LookupDatastoreByName(priv->primary, pool->name, - propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_GetBoolean(datastore, "summary.accessible", - &accessible, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - if (accessible == esxVI_Boolean_True) { - info->state = VIR_STORAGE_POOL_RUNNING; - - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.capacity")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Long) < 0) { - goto cleanup; - } - - info->capacity = dynamicProperty->val->int64; - } else if (STREQ(dynamicProperty->name, "summary.freeSpace")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Long) < 0) { - goto cleanup; - } - - info->available = dynamicProperty->val->int64; - } - } + backendDrvPtr = (virStorageDriverPtr) pool->privateData; - info->allocation = info->capacity - info->available; - } else { - info->state = VIR_STORAGE_POOL_INACCESSIBLE; + if (backendDrvPtr->poolGetInfo(pool, info) < 0) { + goto cleanup; } result = 0; cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); return result; + } @@ -466,123 +313,23 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info) static char * 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_NasDatastoreInfo *nasInfo = NULL; char *xml = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + virStorageDriverPtr backendDrvPtr = NULL; - virCheckFlags(0, NULL); - - memset(&def, 0, sizeof(def)); + virCheckNonNullArgGoto(pool->privateData, cleanup); if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } - - if (esxVI_String_AppendValueListToList(&propertyNameList, - "summary.accessible\0" - "summary.capacity\0" - "summary.freeSpace\0" - "info\0") < 0 || - esxVI_LookupDatastoreByName(priv->primary, pool->name, - propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_GetBoolean(datastore, "summary.accessible", - &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) { - if (STREQ(dynamicProperty->name, "summary.capacity")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Long) < 0) { - goto cleanup; - } - - def.capacity = dynamicProperty->val->int64; - } else if (STREQ(dynamicProperty->name, "summary.freeSpace")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Long) < 0) { - goto cleanup; - } - - def.available = dynamicProperty->val->int64; - } - } - - def.allocation = def.capacity - def.available; - } - - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "info")) { - if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, - &info) < 0) { - goto cleanup; - } - - 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) { - if (VIR_ALLOC_N(def.source.hosts, 1) < 0) { - virReportOOMError(); - goto cleanup; - } - def.type = VIR_STORAGE_POOL_NETFS; - def.source.hosts[0].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 { - virReportError(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 { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("DatastoreInfo has unexpected type")); goto cleanup; } - xml = virStoragePoolDefFormat(&def); + backendDrvPtr = (virStorageDriverPtr) pool->privateData; + xml = backendDrvPtr->poolGetXMLDesc(pool, flags); cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); - esxVI_DatastoreHostMount_Free(&hostMount); - esxVI_DatastoreInfo_Free(&info); return xml; + } @@ -622,33 +369,24 @@ esxStoragePoolNumberOfStorageVolumes(virStoragePoolPtr pool) { bool success = false; esxPrivate *priv = pool->conn->storagePrivateData; - esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; - esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; - esxVI_FileInfo *fileInfo = NULL; + virStorageDriverPtr backendDrvPtr = NULL; int count = 0; - if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; - } + virCheckNonNullArgGoto(pool->privateData, cleanup); - if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, - &searchResultsList) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - /* Interpret search result */ - for (searchResults = searchResultsList; searchResults != NULL; - searchResults = searchResults->_next) { - for (fileInfo = searchResults->file; fileInfo != NULL; - fileInfo = fileInfo->_next) { - ++count; - } + backendDrvPtr = (virStorageDriverPtr) pool->privateData; + count = backendDrvPtr->poolNumOfVolumes(pool); + if (count < 0) { + goto cleanup; } success = true; cleanup: - esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); return success ? count : -1; } @@ -659,87 +397,28 @@ static int esxStoragePoolListStorageVolumes(virStoragePoolPtr pool, char **const names, int maxnames) { - bool success = false; + int result = -1; esxPrivate *priv = pool->conn->storagePrivateData; - esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; - esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; - esxVI_FileInfo *fileInfo = NULL; - char *directoryAndFileName = NULL; - size_t length; - int count = 0; - int i; - - if (names == NULL || maxnames < 0) { - virReportError(VIR_ERR_INVALID_ARG, "%s", _("Invalid argument")); - return -1; - } + virStorageDriverPtr backendDrvPtr = NULL; - if (maxnames == 0) { - return 0; - } + virCheckNonNullArgGoto(pool->privateData, cleanup); if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; - } - - if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, - &searchResultsList) < 0) { goto cleanup; } - /* Interpret search result */ - for (searchResults = searchResultsList; searchResults != NULL; - searchResults = searchResults->_next) { - VIR_FREE(directoryAndFileName); - - if (esxUtil_ParseDatastorePath(searchResults->folderPath, NULL, NULL, - &directoryAndFileName) < 0) { - goto cleanup; - } - - /* Strip trailing separators */ - length = strlen(directoryAndFileName); - - while (length > 0 && directoryAndFileName[length - 1] == '/') { - directoryAndFileName[length - 1] = '\0'; - --length; - } + backendDrvPtr = (virStorageDriverPtr) pool->privateData; - /* Build volume names */ - for (fileInfo = searchResults->file; fileInfo != NULL; - fileInfo = fileInfo->_next) { - if (length < 1) { - names[count] = strdup(fileInfo->path); - - if (names[count] == NULL) { - virReportOOMError(); - goto cleanup; - } - } else if (virAsprintf(&names[count], "%s/%s", directoryAndFileName, - fileInfo->path) < 0) { - virReportOOMError(); - goto cleanup; - } - - ++count; - } + if (backendDrvPtr->poolListVolumes(pool, names, maxnames) < 0) { + goto cleanup; } - success = true; + result = 0; cleanup: - if (! success) { - for (i = 0; i < count; ++i) { - VIR_FREE(names[i]); - } - - count = -1; - } - esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); - VIR_FREE(directoryAndFileName); + return result; - return count; } @@ -749,30 +428,22 @@ esxStorageVolumeLookupByName(virStoragePoolPtr pool, const char *name) { virStorageVolPtr volume = NULL; esxPrivate *priv = pool->conn->storagePrivateData; - char *datastorePath = NULL; - char *key = NULL; - - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } + virStorageDriverPtr backendDrvPtr = NULL; - if (virAsprintf(&datastorePath, "[%s] %s", pool->name, name) < 0) { - virReportOOMError(); - goto cleanup; - } + virCheckNonNullArgGoto(name, cleanup); + virCheckNonNullArgGoto(pool->privateData, cleanup); - if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, - datastorePath, &key) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - volume = virGetStorageVol(pool->conn, pool->name, name, key); + backendDrvPtr = (virStorageDriverPtr) pool->privateData; + volume = backendDrvPtr->volLookupByName(pool, name); cleanup: - VIR_FREE(datastorePath); - VIR_FREE(key); return volume; + } @@ -782,32 +453,30 @@ esxStorageVolumeLookupByPath(virConnectPtr conn, const char *path) { virStorageVolPtr volume = NULL; esxPrivate *priv = conn->storagePrivateData; - char *datastoreName = NULL; - char *directoryAndFileName = NULL; - char *key = NULL; - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } + virCheckNonNullArgGoto(path, cleanup); - if (esxUtil_ParseDatastorePath(path, &datastoreName, NULL, - &directoryAndFileName) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, path, - &key) < 0) { - goto cleanup; + /* FIXME: calling backend blindly may set unwanted error codes + * + * VMFS Datastore path follows cannonical format i.e.: + * [<datastore_name>] <file_path> + * WHEREAS + */ + if (STRPREFIX(path, "[")) { + volume = backendDrv[VMFS]->volLookupByPath(conn, path); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected volume path format: %s"), path); } - volume = virGetStorageVol(conn, datastoreName, directoryAndFileName, key); - - cleanup: - VIR_FREE(datastoreName); - VIR_FREE(directoryAndFileName); - VIR_FREE(key); +cleanup: return volume; + } @@ -817,140 +486,29 @@ esxStorageVolumeLookupByKey(virConnectPtr conn, const char *key) { virStorageVolPtr volume = NULL; esxPrivate *priv = conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastoreList = NULL; - esxVI_ObjectContent *datastore = NULL; - char *datastoreName = NULL; - esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; - esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; - char *directoryAndFileName = NULL; - size_t length; - char *datastorePath = NULL; - char *volumeName = NULL; - esxVI_FileInfo *fileInfo = NULL; - char *uuid_string = NULL; - char key_candidate[VIR_UUID_STRING_BUFLEN] = ""; - - if (STRPREFIX(key, "[")) { - /* Key is probably a datastore path */ - return esxStorageVolumeLookupByPath(conn, key); - } + int i = 0; - if (!priv->primary->hasQueryVirtualDiskUuid) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("QueryVirtualDiskUuid not available, cannot lookup storage " - "volume by UUID")); - return NULL; - } + virCheckNonNullArgGoto(key, cleanup); if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } - - /* Lookup all datastores */ - if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupDatastoreList(priv->primary, propertyNameList, - &datastoreList) < 0) { goto cleanup; } - for (datastore = datastoreList; datastore != NULL; - datastore = datastore->_next) { - datastoreName = NULL; - - if (esxVI_GetStringValue(datastore, "summary.name", &datastoreName, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } - - /* Lookup datastore content */ - esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); - - if (esxVI_LookupDatastoreContentByDatastoreName - (priv->primary, datastoreName, &searchResultsList) < 0) { - goto cleanup; - } - - /* Interpret search result */ - for (searchResults = searchResultsList; searchResults != NULL; - searchResults = searchResults->_next) { - VIR_FREE(directoryAndFileName); - - if (esxUtil_ParseDatastorePath(searchResults->folderPath, NULL, - NULL, &directoryAndFileName) < 0) { - goto cleanup; - } - - /* Strip trailing separators */ - length = strlen(directoryAndFileName); - - while (length > 0 && directoryAndFileName[length - 1] == '/') { - directoryAndFileName[length - 1] = '\0'; - --length; - } - - /* Build datastore path and query the UUID */ - for (fileInfo = searchResults->file; fileInfo != NULL; - fileInfo = fileInfo->_next) { - VIR_FREE(datastorePath); - - if (length < 1) { - if (virAsprintf(&volumeName, "%s", - fileInfo->path) < 0) { - virReportOOMError(); - goto cleanup; - } - } else if (virAsprintf(&volumeName, "%s/%s", - directoryAndFileName, - fileInfo->path) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, - volumeName) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_VmDiskFileInfo_DynamicCast(fileInfo) == NULL) { - /* Only a VirtualDisk has a UUID */ - continue; - } - - VIR_FREE(uuid_string); - - if (esxVI_QueryVirtualDiskUuid - (priv->primary, datastorePath, - priv->primary->datacenter->_reference, - &uuid_string) < 0) { - goto cleanup; - } - - if (esxUtil_ReformatUuid(uuid_string, key_candidate) < 0) { - goto cleanup; - } - - if (STREQ(key, key_candidate)) { - /* Found matching UUID */ - volume = virGetStorageVol(conn, datastoreName, - volumeName, key); - goto cleanup; - } - } + /* lookup by key operation is supported using connection + * pointer, so poke all supported backend drivers to perform + * the desired operation + */ + for (i = 0; i < LAST_DRIVER; ++i) { + volume = backendDrv[i]->volLookupByKey(conn, key); + if (volume != NULL) { + break; } } - cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastoreList); - esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); - VIR_FREE(directoryAndFileName); - VIR_FREE(datastorePath); - VIR_FREE(volumeName); - VIR_FREE(uuid_string); +cleanup: return volume; + } @@ -961,224 +519,22 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, { virStorageVolPtr volume = NULL; esxPrivate *priv = pool->conn->storagePrivateData; - virStoragePoolDef poolDef; - virStorageVolDefPtr def = NULL; - char *tmp; - char *unescapedDatastorePath = NULL; - char *unescapedDirectoryName = NULL; - char *unescapedDirectoryAndFileName = NULL; - char *directoryName = NULL; - char *fileName = NULL; - char *datastorePathWithoutFileName = NULL; - char *datastorePath = NULL; - esxVI_FileInfo *fileInfo = NULL; - esxVI_FileBackedVirtualDiskSpec *virtualDiskSpec = NULL; - esxVI_ManagedObjectReference *task = NULL; - esxVI_TaskInfoState taskInfoState; - char *taskInfoErrorMessage = NULL; - char *uuid_string = NULL; - char *key = NULL; - - virCheckFlags(0, NULL); - - memset(&poolDef, 0, sizeof(poolDef)); - - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } - - if (esxStoragePoolLookupType(priv->primary, pool->name, &poolDef.type) < 0) { - return NULL; - } - - /* Parse config */ - def = virStorageVolDefParseString(&poolDef, xmldesc); - - if (def == NULL) { - goto cleanup; - } - - if (def->type != VIR_STORAGE_VOL_FILE) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Creating non-file volumes is not supported")); - goto cleanup; - } - - /* Validate config */ - tmp = strrchr(def->name, '/'); - - if (tmp == NULL || *def->name == '/' || tmp[1] == '\0') { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Volume name '%s' doesn't have expected format " - "'<directory>/<file>'"), def->name); - goto cleanup; - } - - if (! virFileHasSuffix(def->name, ".vmdk")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Volume name '%s' has unsupported suffix, expecting '.vmdk'"), - def->name); - goto cleanup; - } - - if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, - def->name) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (def->target.format == VIR_STORAGE_FILE_VMDK) { - /* Parse and escape datastore path */ - if (esxUtil_ParseDatastorePath(unescapedDatastorePath, NULL, - &unescapedDirectoryName, - &unescapedDirectoryAndFileName) < 0) { - goto cleanup; - } - - directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); - - if (directoryName == NULL) { - goto cleanup; - } - - fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + - strlen(unescapedDirectoryName) + 1); - - if (fileName == NULL) { - goto cleanup; - } - - if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, - directoryName) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, - fileName) < 0) { - virReportOOMError(); - goto cleanup; - } - - /* Create directory, if it doesn't exist yet */ - if (esxVI_LookupFileInfoByDatastorePath - (priv->primary, datastorePathWithoutFileName, true, &fileInfo, - esxVI_Occurrence_OptionalItem) < 0) { - goto cleanup; - } - - if (fileInfo == NULL) { - if (esxVI_MakeDirectory(priv->primary, datastorePathWithoutFileName, - priv->primary->datacenter->_reference, - esxVI_Boolean_True) < 0) { - goto cleanup; - } - } + virStorageDriverPtr backendDrvPtr = NULL; - /* Create VirtualDisk */ - if (esxVI_FileBackedVirtualDiskSpec_Alloc(&virtualDiskSpec) < 0 || - esxVI_Long_Alloc(&virtualDiskSpec->capacityKb) < 0) { - goto cleanup; - } - - /* From the vSphere API documentation about VirtualDiskType ... */ - if (def->allocation == def->capacity) { - /* - * "A preallocated disk has all space allocated at creation time - * and the space is zeroed on demand as the space is used." - */ - virtualDiskSpec->diskType = (char *)"preallocated"; - } else if (def->allocation == 0) { - /* - * "Space required for thin-provisioned virtual disk is allocated - * and zeroed on demand as the space is used." - */ - virtualDiskSpec->diskType = (char *)"thin"; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unsupported capacity-to-allocation relation")); - goto cleanup; - } - - /* - * FIXME: The adapter type is a required parameter, but there is no - * way to let the user specify it in the volume XML config. Therefore, - * default to 'busLogic' here. - */ - virtualDiskSpec->adapterType = (char *)"busLogic"; - - virtualDiskSpec->capacityKb->value = - VIR_DIV_UP(def->capacity, 1024); /* Scale from byte to kilobyte */ - - if (esxVI_CreateVirtualDisk_Task - (priv->primary, datastorePath, priv->primary->datacenter->_reference, - esxVI_VirtualDiskSpec_DynamicCast(virtualDiskSpec), &task) < 0 || - esxVI_WaitForTaskCompletion(priv->primary, task, NULL, - esxVI_Occurrence_None, - priv->parsedUri->autoAnswer, - &taskInfoState, - &taskInfoErrorMessage) < 0) { - goto cleanup; - } - - if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create volume: %s"), - taskInfoErrorMessage); - goto cleanup; - } + virCheckNonNullArgGoto(xmldesc, cleanup); + virCheckNonNullArgGoto(pool->privateData, cleanup); - if (priv->primary->hasQueryVirtualDiskUuid) { - if (VIR_ALLOC_N(key, VIR_UUID_STRING_BUFLEN) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_QueryVirtualDiskUuid(priv->primary, datastorePath, - priv->primary->datacenter->_reference, - &uuid_string) < 0) { - goto cleanup; - } - - if (esxUtil_ReformatUuid(uuid_string, key) < 0) { - goto cleanup; - } - } else { - /* Fall back to the path as key */ - if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { - goto cleanup; - } - } - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Creation of %s volumes is not supported"), - virStorageFileFormatTypeToString(def->target.format)); + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - volume = virGetStorageVol(pool->conn, pool->name, def->name, key); + backendDrvPtr = (virStorageDriverPtr) pool->privateData; + volume = backendDrvPtr->volCreateXML(pool, xmldesc, flags); cleanup: - if (virtualDiskSpec != NULL) { - virtualDiskSpec->diskType = NULL; - virtualDiskSpec->adapterType = NULL; - } - - virStorageVolDefFree(def); - VIR_FREE(unescapedDatastorePath); - VIR_FREE(unescapedDirectoryName); - VIR_FREE(unescapedDirectoryAndFileName); - VIR_FREE(directoryName); - VIR_FREE(fileName); - VIR_FREE(datastorePathWithoutFileName); - VIR_FREE(datastorePath); - esxVI_FileInfo_Free(&fileInfo); - esxVI_FileBackedVirtualDiskSpec_Free(&virtualDiskSpec); - esxVI_ManagedObjectReference_Free(&task); - VIR_FREE(taskInfoErrorMessage); - VIR_FREE(uuid_string); - VIR_FREE(key); return volume; + } @@ -1189,193 +545,22 @@ esxStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, { virStorageVolPtr volume = NULL; esxPrivate *priv = pool->conn->storagePrivateData; - virStoragePoolDef poolDef; - char *sourceDatastorePath = NULL; - virStorageVolDefPtr def = NULL; - char *tmp; - char *unescapedDatastorePath = NULL; - char *unescapedDirectoryName = NULL; - char *unescapedDirectoryAndFileName = NULL; - char *directoryName = NULL; - char *fileName = NULL; - char *datastorePathWithoutFileName = NULL; - char *datastorePath = NULL; - esxVI_FileInfo *fileInfo = NULL; - esxVI_ManagedObjectReference *task = NULL; - esxVI_TaskInfoState taskInfoState; - char *taskInfoErrorMessage = NULL; - char *uuid_string = NULL; - char *key = NULL; - - virCheckFlags(0, NULL); - - memset(&poolDef, 0, sizeof(poolDef)); - - if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } - - if (esxStoragePoolLookupType(priv->primary, pool->name, &poolDef.type) < 0) { - return NULL; - } - - if (virAsprintf(&sourceDatastorePath, "[%s] %s", sourceVolume->pool, - sourceVolume->name) < 0) { - virReportOOMError(); - goto cleanup; - } - - /* Parse config */ - def = virStorageVolDefParseString(&poolDef, xmldesc); - - if (def == NULL) { - goto cleanup; - } - - if (def->type != VIR_STORAGE_VOL_FILE) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Creating non-file volumes is not supported")); - goto cleanup; - } - - /* Validate config */ - tmp = strrchr(def->name, '/'); - - if (tmp == NULL || *def->name == '/' || tmp[1] == '\0') { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Volume name '%s' doesn't have expected format " - "'<directory>/<file>'"), def->name); - goto cleanup; - } - - if (! virFileHasSuffix(def->name, ".vmdk")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Volume name '%s' has unsupported suffix, expecting '.vmdk'"), - def->name); - goto cleanup; - } - - if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, - def->name) < 0) { - virReportOOMError(); - goto cleanup; - } + virStorageDriverPtr backendDrvPtr = NULL; - if (def->target.format == VIR_STORAGE_FILE_VMDK) { - /* Parse and escape datastore path */ - if (esxUtil_ParseDatastorePath(unescapedDatastorePath, NULL, - &unescapedDirectoryName, - &unescapedDirectoryAndFileName) < 0) { - goto cleanup; - } + virCheckNonNullArgGoto(xmldesc, cleanup); + virCheckNonNullArgGoto(pool->privateData, cleanup); - directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); - - if (directoryName == NULL) { - goto cleanup; - } - - fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + - strlen(unescapedDirectoryName) + 1); - - if (fileName == NULL) { - goto cleanup; - } - - if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, - directoryName) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, - fileName) < 0) { - virReportOOMError(); - goto cleanup; - } - - /* Create directory, if it doesn't exist yet */ - if (esxVI_LookupFileInfoByDatastorePath - (priv->primary, datastorePathWithoutFileName, true, &fileInfo, - esxVI_Occurrence_OptionalItem) < 0) { - goto cleanup; - } - - if (fileInfo == NULL) { - if (esxVI_MakeDirectory(priv->primary, datastorePathWithoutFileName, - priv->primary->datacenter->_reference, - esxVI_Boolean_True) < 0) { - goto cleanup; - } - } - - /* Copy VirtualDisk */ - if (esxVI_CopyVirtualDisk_Task(priv->primary, sourceDatastorePath, - priv->primary->datacenter->_reference, - datastorePath, - priv->primary->datacenter->_reference, - NULL, esxVI_Boolean_False, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->primary, task, NULL, - esxVI_Occurrence_None, - priv->parsedUri->autoAnswer, - &taskInfoState, - &taskInfoErrorMessage) < 0) { - goto cleanup; - } - - if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not copy volume: %s"), - taskInfoErrorMessage); - goto cleanup; - } - - if (priv->primary->hasQueryVirtualDiskUuid) { - if (VIR_ALLOC_N(key, VIR_UUID_STRING_BUFLEN) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_QueryVirtualDiskUuid(priv->primary, datastorePath, - priv->primary->datacenter->_reference, - &uuid_string) < 0) { - goto cleanup; - } - - if (esxUtil_ReformatUuid(uuid_string, key) < 0) { - goto cleanup; - } - } else { - /* Fall back to the path as key */ - if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { - goto cleanup; - } - } - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Creation of %s volumes is not supported"), - virStorageFileFormatTypeToString(def->target.format)); + if (esxVI_EnsureSession(priv->primary) < 0) { goto cleanup; } - volume = virGetStorageVol(pool->conn, pool->name, def->name, key); + backendDrvPtr = (virStorageDriverPtr) pool->privateData; + volume = backendDrvPtr->volCreateXMLFrom(pool, xmldesc, sourceVolume, flags); cleanup: - VIR_FREE(sourceDatastorePath); - virStorageVolDefFree(def); - VIR_FREE(unescapedDatastorePath); - VIR_FREE(unescapedDirectoryName); - VIR_FREE(unescapedDirectoryAndFileName); - VIR_FREE(directoryName); - VIR_FREE(fileName); - VIR_FREE(datastorePathWithoutFileName); - VIR_FREE(datastorePath); - esxVI_FileInfo_Free(&fileInfo); - esxVI_ManagedObjectReference_Free(&task); - VIR_FREE(taskInfoErrorMessage); - VIR_FREE(uuid_string); - VIR_FREE(key); return volume; + } @@ -1383,48 +568,27 @@ esxStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, static int esxStorageVolumeDelete(virStorageVolPtr volume, unsigned int flags) { - int result = -1; + int err = -1; esxPrivate *priv = volume->conn->storagePrivateData; - char *datastorePath = NULL; - esxVI_ManagedObjectReference *task = NULL; - esxVI_TaskInfoState taskInfoState; - char *taskInfoErrorMessage = NULL; + virStorageDriverPtr backendDrvPtr = NULL; - virCheckFlags(0, -1); + virCheckNonNullArgGoto(volume->privateData, cleanup); if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (esxVI_DeleteVirtualDisk_Task(priv->primary, datastorePath, - priv->primary->datacenter->_reference, - &task) < 0 || - esxVI_WaitForTaskCompletion(priv->primary, task, NULL, - esxVI_Occurrence_None, - priv->parsedUri->autoAnswer, - &taskInfoState, &taskInfoErrorMessage) < 0) { + backendDrvPtr = (virStorageDriverPtr) volume->privateData; + if (backendDrvPtr->volDelete(volume , flags) < 0) { goto cleanup; } - if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not delete volume: %s"), - taskInfoErrorMessage); - goto cleanup; - } + err = 0; - result = 0; +cleanup: - cleanup: - VIR_FREE(datastorePath); - esxVI_ManagedObjectReference_Free(&task); - VIR_FREE(taskInfoErrorMessage); + return err; - return result; } @@ -1432,97 +596,54 @@ esxStorageVolumeDelete(virStorageVolPtr volume, unsigned int flags) static int esxStorageVolumeWipe(virStorageVolPtr volume, unsigned int flags) { - int result = -1; + int err = -1; esxPrivate *priv = volume->conn->storagePrivateData; - char *datastorePath = NULL; - esxVI_ManagedObjectReference *task = NULL; - esxVI_TaskInfoState taskInfoState; - char *taskInfoErrorMessage = NULL; + virStorageDriverPtr backendDrvPtr = NULL; - virCheckFlags(0, -1); + virCheckNonNullArgGoto(volume->privateData, cleanup); if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; - } - - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { - virReportOOMError(); goto cleanup; } - if (esxVI_ZeroFillVirtualDisk_Task(priv->primary, datastorePath, - priv->primary->datacenter->_reference, - &task) < 0 || - esxVI_WaitForTaskCompletion(priv->primary, task, NULL, - esxVI_Occurrence_None, - priv->parsedUri->autoAnswer, - &taskInfoState, &taskInfoErrorMessage) < 0) { + backendDrvPtr = (virStorageDriverPtr) volume->privateData; + if (backendDrvPtr->volWipe(volume , flags) < 0) { goto cleanup; } - if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not wipe volume: %s"), - taskInfoErrorMessage); - goto cleanup; - } + err = 0; - result = 0; + cleanup: - cleanup: - VIR_FREE(datastorePath); - esxVI_ManagedObjectReference_Free(&task); - VIR_FREE(taskInfoErrorMessage); + return err; - return result; } - static int esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) { - int result = -1; + int err = -1; esxPrivate *priv = volume->conn->storagePrivateData; - char *datastorePath = NULL; - esxVI_FileInfo *fileInfo = NULL; - esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; + virStorageDriverPtr backendDrvPtr = NULL; - memset(info, 0, sizeof(*info)); + virCheckNonNullArgGoto(volume->privateData, cleanup); if (esxVI_EnsureSession(priv->primary) < 0) { - return -1; - } - - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { - virReportOOMError(); goto cleanup; } - if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, - false, &fileInfo, - esxVI_Occurrence_RequiredItem) < 0) { + backendDrvPtr = (virStorageDriverPtr) volume->privateData; + if (backendDrvPtr->volGetInfo(volume , info) < 0) { goto cleanup; } - vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(fileInfo); + err = 0; - info->type = VIR_STORAGE_VOL_FILE; + cleanup: - if (vmDiskFileInfo != NULL) { - info->capacity = vmDiskFileInfo->capacityKb->value * 1024; /* Scale from kilobyte to byte */ - info->allocation = vmDiskFileInfo->fileSize->value; - } else { - info->capacity = fileInfo->fileSize->value; - info->allocation = fileInfo->fileSize->value; - } - - result = 0; - - cleanup: - VIR_FREE(datastorePath); - esxVI_FileInfo_Free(&fileInfo); + return err; - return result; } @@ -1530,84 +651,24 @@ esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) static char * esxStorageVolumeGetXMLDesc(virStorageVolPtr volume, unsigned int flags) { - esxPrivate *priv = volume->conn->storagePrivateData; - virStoragePoolDef pool; - char *datastorePath = NULL; - esxVI_FileInfo *fileInfo = NULL; - esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; - esxVI_IsoImageFileInfo *isoImageFileInfo = NULL; - esxVI_FloppyImageFileInfo *floppyImageFileInfo = NULL; - virStorageVolDef def; char *xml = NULL; + esxPrivate *priv = volume->conn->storagePrivateData; + virStorageDriverPtr backendDrvPtr = NULL; - virCheckFlags(0, NULL); - - memset(&pool, 0, sizeof(pool)); - memset(&def, 0, sizeof(def)); + virCheckNonNullArgGoto(volume->privateData, cleanup); if (esxVI_EnsureSession(priv->primary) < 0) { - return NULL; - } - - if (esxStoragePoolLookupType(priv->primary, volume->pool, &pool.type) < 0) { - return NULL; - } - - /* Lookup file info */ - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { - virReportOOMError(); goto cleanup; } - if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, - false, &fileInfo, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } + backendDrvPtr = (virStorageDriverPtr) volume->privateData; - vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(fileInfo); - isoImageFileInfo = esxVI_IsoImageFileInfo_DynamicCast(fileInfo); - floppyImageFileInfo = esxVI_FloppyImageFileInfo_DynamicCast(fileInfo); + xml = backendDrvPtr->volGetXMLDesc(volume, flags); - def.name = volume->name; - - if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, datastorePath, - &def.key) < 0) { - goto cleanup; - } - - def.type = VIR_STORAGE_VOL_FILE; - def.target.path = datastorePath; - - if (vmDiskFileInfo != NULL) { - def.capacity = vmDiskFileInfo->capacityKb->value * 1024; /* Scale from kilobyte to byte */ - def.allocation = vmDiskFileInfo->fileSize->value; - - def.target.format = VIR_STORAGE_FILE_VMDK; - } else if (isoImageFileInfo != NULL) { - def.capacity = fileInfo->fileSize->value; - def.allocation = fileInfo->fileSize->value; - - def.target.format = VIR_STORAGE_FILE_ISO; - } else if (floppyImageFileInfo != NULL) { - def.capacity = fileInfo->fileSize->value; - def.allocation = fileInfo->fileSize->value; - - def.target.format = VIR_STORAGE_FILE_RAW; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("File '%s' has unknown type"), datastorePath); - goto cleanup; - } - - xml = virStorageVolDefFormat(&pool, &def); - - cleanup: - VIR_FREE(datastorePath); - esxVI_FileInfo_Free(&fileInfo); - VIR_FREE(def.key); + cleanup: return xml; + } @@ -1615,14 +676,24 @@ esxStorageVolumeGetXMLDesc(virStorageVolPtr volume, unsigned int flags) static char * esxStorageVolumeGetPath(virStorageVolPtr volume) { - char *path; + char *path = NULL; + esxPrivate *priv = volume->conn->storagePrivateData; + virStorageDriverPtr backendDrvPtr = NULL; - if (virAsprintf(&path, "[%s] %s", volume->pool, volume->name) < 0) { - virReportOOMError(); - return NULL; + virCheckNonNullArgGoto(volume->privateData, cleanup); + + if (esxVI_EnsureSession(priv->primary) < 0) { + goto cleanup; } + backendDrvPtr = (virStorageDriverPtr) volume->privateData; + + path = backendDrvPtr->volGetPath(volume); + + cleanup: + return path; + } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index f3224f8..9fb2c11 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -3107,7 +3107,8 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, int esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, esxVI_ManagedObjectReference *datastore, - esxVI_DatastoreHostMount **hostMount) + esxVI_DatastoreHostMount **hostMount, + esxVI_Occurrence occurrence) { int result = -1; esxVI_String *propertyNameList = NULL; @@ -3155,7 +3156,7 @@ esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, break; } - if (*hostMount == NULL) { + if (*hostMount == NULL && occurrence == esxVI_Occurrence_RequiredItem) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not lookup datastore host mount")); goto cleanup; diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index a9c12c8..d7895a0 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -441,7 +441,8 @@ int esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, int esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, esxVI_ManagedObjectReference *datastore, - esxVI_DatastoreHostMount **hostMount); + esxVI_DatastoreHostMount **hostMount, + esxVI_Occurrence occurrence); int esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, esxVI_ManagedObjectReference *task, diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index 71f3f89..8d4e2c6 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -350,7 +350,8 @@ parallelsStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) goto cleanup; } - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: if (pool) @@ -374,7 +375,8 @@ parallelsStoragePoolLookupByName(virConnectPtr conn, const char *name) goto cleanup; } - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: if (pool) @@ -459,7 +461,8 @@ parallelsStoragePoolDefine(virConnectPtr conn, goto cleanup; } - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: virStoragePoolDefFree(def); @@ -831,7 +834,8 @@ parallelsStorageVolumeLookupByName(virStoragePoolPtr pool, } ret = virGetStorageVol(pool->conn, privpool->def->name, - privvol->name, privvol->key); + privvol->name, privvol->key, + NULL, NULL); cleanup: if (privpool) @@ -857,7 +861,8 @@ parallelsStorageVolumeLookupByKey(virConnectPtr conn, const char *key) if (privvol) { ret = virGetStorageVol(conn, privconn->pools.objs[i]->def->name, - privvol->name, privvol->key); + privvol->name, privvol->key, + NULL, NULL); virStoragePoolObjUnlock(privconn->pools.objs[i]); break; } @@ -889,7 +894,8 @@ parallelsStorageVolumeLookupByPathLocked(virConnectPtr conn, const char *path) if (privvol) { ret = virGetStorageVol(conn, privconn->pools.objs[i]->def->name, - privvol->name, privvol->key); + privvol->name, privvol->key, + NULL, NULL); virStoragePoolObjUnlock(privconn->pools.objs[i]); break; } @@ -1026,7 +1032,8 @@ parallelsStorageVolumeCreateXML(virStoragePoolPtr pool, goto cleanup; ret = virGetStorageVol(pool->conn, privpool->def->name, - privvol->name, privvol->key); + privvol->name, privvol->key, + NULL, NULL); cleanup: if (privpool) virStoragePoolObjUnlock(privpool); @@ -1115,7 +1122,8 @@ parallelsStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, privpool->volumes.objs[privpool->volumes.count++] = privvol; ret = virGetStorageVol(pool->conn, privpool->def->name, - privvol->name, privvol->key); + privvol->name, privvol->key, + NULL, NULL); privvol = NULL; cleanup: diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 62b7729..ec33698 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5863,13 +5863,15 @@ get_nonnull_interface(virConnectPtr conn, remote_nonnull_interface iface) static virStoragePoolPtr get_nonnull_storage_pool(virConnectPtr conn, remote_nonnull_storage_pool pool) { - return virGetStoragePool(conn, pool.name, BAD_CAST pool.uuid); + return virGetStoragePool(conn, pool.name, BAD_CAST pool.uuid, + NULL, NULL); } static virStorageVolPtr get_nonnull_storage_vol(virConnectPtr conn, remote_nonnull_storage_vol vol) { - return virGetStorageVol(conn, vol.pool, vol.name, vol.key); + return virGetStorageVol(conn, vol.pool, vol.name, vol.key, + NULL, NULL); } static virNodeDevicePtr diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index faca2a2..2e33b80 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -273,7 +273,8 @@ storagePoolLookupByUUID(virConnectPtr conn, goto cleanup; } - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: if (pool) @@ -298,7 +299,8 @@ storagePoolLookupByName(virConnectPtr conn, goto cleanup; } - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: if (pool) @@ -555,7 +557,8 @@ storagePoolCreate(virConnectPtr conn, VIR_INFO("Creating storage pool '%s'", pool->def->name); pool->active = 1; - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: virStoragePoolDefFree(def); @@ -601,7 +604,8 @@ storagePoolDefine(virConnectPtr conn, def = NULL; VIR_INFO("Defining storage pool '%s'", pool->def->name); - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: virStoragePoolDefFree(def); @@ -1202,7 +1206,8 @@ storagePoolListAllVolumes(virStoragePoolPtr pool, for (i = 0 ; i < obj->volumes.count; i++) { if (!(vol = virGetStorageVol(pool->conn, obj->def->name, obj->volumes.objs[i]->name, - obj->volumes.objs[i]->key))) + obj->volumes.objs[i]->key, + NULL, NULL))) goto cleanup; tmp_vols[nvols++] = vol; } @@ -1258,7 +1263,8 @@ storageVolumeLookupByName(virStoragePoolPtr obj, goto cleanup; } - ret = virGetStorageVol(obj->conn, pool->def->name, vol->name, vol->key); + ret = virGetStorageVol(obj->conn, pool->def->name, vol->name, vol->key, + NULL, NULL); cleanup: if (pool) @@ -1285,7 +1291,8 @@ storageVolumeLookupByKey(virConnectPtr conn, ret = virGetStorageVol(conn, driver->pools.objs[i]->def->name, vol->name, - vol->key); + vol->key, + NULL, NULL); } virStoragePoolObjUnlock(driver->pools.objs[i]); } @@ -1338,7 +1345,8 @@ storageVolumeLookupByPath(virConnectPtr conn, ret = virGetStorageVol(conn, driver->pools.objs[i]->def->name, vol->name, - vol->key); + vol->key, + NULL, NULL); } virStoragePoolObjUnlock(driver->pools.objs[i]); } @@ -1415,7 +1423,7 @@ storageVolumeCreateXML(virStoragePoolPtr obj, pool->volumes.objs[pool->volumes.count++] = voldef; volobj = virGetStorageVol(obj->conn, pool->def->name, voldef->name, - voldef->key); + voldef->key, NULL, NULL); if (!volobj) { pool->volumes.count--; goto cleanup; @@ -1587,7 +1595,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, pool->volumes.objs[pool->volumes.count++] = newvol; volobj = virGetStorageVol(obj->conn, pool->def->name, newvol->name, - newvol->key); + newvol->key, NULL, NULL); /* Drop the pool lock during volume allocation */ pool->asyncjobs++; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 9e4d9f2..6ca59e2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3885,7 +3885,8 @@ testStoragePoolLookupByUUID(virConnectPtr conn, goto cleanup; } - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: if (pool) @@ -3909,7 +3910,8 @@ testStoragePoolLookupByName(virConnectPtr conn, goto cleanup; } - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: if (pool) @@ -4201,7 +4203,8 @@ testStoragePoolCreate(virConnectPtr conn, } pool->active = 1; - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: virStoragePoolDefFree(def); @@ -4241,7 +4244,8 @@ testStoragePoolDefine(virConnectPtr conn, goto cleanup; } - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); cleanup: virStoragePoolDefFree(def); @@ -4668,7 +4672,8 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj, for (i = 0 ; i < pool->volumes.count; i++) { if (!(vol = virGetStorageVol(obj->conn, pool->def->name, pool->volumes.objs[i]->name, - pool->volumes.objs[i]->key))) + pool->volumes.objs[i]->key, + NULL, NULL))) goto cleanup; tmp_vols[nvols++] = vol; } @@ -4725,7 +4730,8 @@ testStorageVolumeLookupByName(virStoragePoolPtr pool, } ret = virGetStorageVol(pool->conn, privpool->def->name, - privvol->name, privvol->key); + privvol->name, privvol->key, + NULL, NULL); cleanup: if (privpool) @@ -4752,7 +4758,8 @@ testStorageVolumeLookupByKey(virConnectPtr conn, ret = virGetStorageVol(conn, privconn->pools.objs[i]->def->name, privvol->name, - privvol->key); + privvol->key, + NULL, NULL); virStoragePoolObjUnlock(privconn->pools.objs[i]); break; } @@ -4786,7 +4793,8 @@ testStorageVolumeLookupByPath(virConnectPtr conn, ret = virGetStorageVol(conn, privconn->pools.objs[i]->def->name, privvol->name, - privvol->key); + privvol->key, + NULL, NULL); virStoragePoolObjUnlock(privconn->pools.objs[i]); break; } @@ -4875,7 +4883,8 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool, privpool->volumes.objs[privpool->volumes.count++] = privvol; ret = virGetStorageVol(pool->conn, privpool->def->name, - privvol->name, privvol->key); + privvol->name, privvol->key, + NULL, NULL); privvol = NULL; cleanup: @@ -4969,7 +4978,8 @@ testStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, privpool->volumes.objs[privpool->volumes.count++] = privvol; ret = virGetStorageVol(pool->conn, privpool->def->name, - privvol->name, privvol->key); + privvol->name, privvol->key, + NULL, NULL); privvol = NULL; cleanup: diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index bcffb2f..f9fa442 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -8321,7 +8321,7 @@ static virStoragePoolPtr vboxStoragePoolLookupByName(virConnectPtr conn, const c ignore_value(virUUIDParse(uuidstr, uuid)); - ret = virGetStoragePool(conn, name, uuid); + ret = virGetStoragePool(conn, name, uuid, NULL, NULL); } return ret; @@ -8450,7 +8450,8 @@ static virStorageVolPtr vboxStorageVolLookupByName(virStoragePoolPtr pool, const vboxIIDToUUID(&hddIID, uuid); virUUIDFormat(uuid, key); - ret = virGetStorageVol(pool->conn, pool->name, name, key); + ret = virGetStorageVol(pool->conn, pool->name, name, key, + NULL, NULL); VIR_DEBUG("virStorageVolPtr: %p", ret); VIR_DEBUG("Storage Volume Name: %s", name); @@ -8511,7 +8512,8 @@ static virStorageVolPtr vboxStorageVolLookupByKey(virConnectPtr conn, const char if (hddNameUtf8) { if (vboxStorageNumOfPools(conn) == 1) { - ret = virGetStorageVol(conn, "default-pool", hddNameUtf8, key); + ret = virGetStorageVol(conn, "default-pool", hddNameUtf8, key, + NULL, NULL); VIR_DEBUG("Storage Volume Pool: %s", "default-pool"); } else { /* TODO: currently only one default pool and thus @@ -8583,7 +8585,8 @@ static virStorageVolPtr vboxStorageVolLookupByPath(virConnectPtr conn, const cha * the check below, change it when pools are supported */ if (vboxStorageNumOfPools(conn) == 1) - ret = virGetStorageVol(conn, "default-pool", hddNameUtf8, key); + ret = virGetStorageVol(conn, "default-pool", hddNameUtf8, key, + NULL, NULL); VIR_DEBUG("Storage Volume Pool: %s", "default-pool"); VIR_DEBUG("Storage Volume Name: %s", hddNameUtf8); @@ -8683,7 +8686,8 @@ static virStorageVolPtr vboxStorageVolCreateXML(virStoragePoolPtr pool, vboxIIDToUUID(&hddIID, uuid); virUUIDFormat(uuid, key); - ret = virGetStorageVol(pool->conn, pool->name, def->name, key); + ret = virGetStorageVol(pool->conn, pool->name, def->name, key, + NULL, NULL); } vboxIIDUnalloc(&hddIID); -- 1.7.9.5

2 1

[libvirt] Proposal: no dnsmasq (no dhcp and no dns) and no radvd option
by Gene Czarcinski 27 Nov '12

27 Nov '12

Laine mentioned something yesterday that got me to thinking: being able to specify that dnsmasq is not to be started for an interface. Let me expand that by saying that libvirt would not start dnsmasq for either dns or dhcp and also would not start radvd. However, the IPv4 and IPv6 gateway addresses would be defined on the virtual network interface and the "usual" iptables and ip6tables rules would be in force. This would allow a user to configure dnsmasq to meet any user desires or use something completely different instead of dnsmasq. Questions: Useful? Worth the time and effort? And then there is how should this be specified in the network xml file? ... some new parameter? ... A subperameter of <dns> such as <dns disable='yes' /> ? ... a subparameter of <bridge> such as <bridge name="virbr0" dns="disable" /> ? Comments? Suggestions? Gene

4 16

[libvirt] Is DBus a hard dependency
by Guido Günther 27 Nov '12

27 Nov '12

Hi, currently running libvirtd without DBus fails due to: error : nwfilterDriverStartup:208 : DBus matches could not be installed. Disabling nwfilter driver error : virDBusGetSystemBus:77 : internal error Unable to get DBus system bus connection: Failed to connect to socket /var/run/dbus/system_bus_socket: No such file or directory error : virStateInitialize:810 : Initialization of NWFilter state driver failed error : daemonRunStateInit:784 : Driver state initialization failed because we fail driver initialization hard in nwfilter_driver.c: if (nwfilterDriverInstallDBusMatches(sysbus) < 0) { VIR_ERROR(_("DBus matches could not be installed. Disabling nwfilter " "driver")); /* * unfortunately this is fatal since virNWFilterTechDriversInit * may have caused the ebiptables driver to use the firewall tool * but now that the watches don't work, we just disable the nwfilter * driver */ goto error; } I wonder if this on prupose or if we can just make this a soft error and go on without DBus? At least in the !HAVE_FIREWALLD case it should be o.k. to continue. Shouldn't it? See attached patch. Cheers, -- Guido

2 2

[libvirt] [PATCH 0/3] network: resolve CVE 2012-3411
by Laine Stump 27 Nov '12

27 Nov '12

This patch series resolves the libvirt part of CVE 2012-3411: https://bugzilla.redhat.com/show_bug.cgi?id=833033 Further details are in PATCH 3/3.

3 12

[libvirt] [PATCH] Add detailed error information to journal
by Miloslav Trmač 27 Nov '12

27 Nov '12

When logging an error, don't throw away the detailed information. Example record when using the journald output: MESSAGE=Domain not found PRIORITY=4 LIBVIRT_SOURCE=error CODE_FILE=../../src/test/test_driver.c CODE_LINE=1406 CODE_FUNC=testLookupDomainByName DOMAIN=12 CODE=42 The format used in other output destinations (e.g. "syslog", "file") is still unchanged. The "domain" and "code" numbers are part of the libvirt ABI in <libvirt/virterror.h>; therefore log processing tools can rely on them, unlike the text log string (which is translated depending on locale, and may be modified for other reasons as well). Alternatively, the "domain" and "code" fields could contain strings instead of numbers, but it's not clear that it's worth it: Advantages of numbers: * the numbers are shorter * the ABI guarantees that the numbers won't change Disadvantages of strings: * adding a ABI-stable string mapping for virErrorNumber would result in additional work each time a new error number is added (note that virErrorMsg cannot be used for this because it is translated) * a change in the string mapping would be less likely to be noticed The advantage of using strings is more readability, but note that the "msg" field above already contains a readable description of the error. The inability to allocate memory imposes a fixed limit on the number of metadata fields that can be supported by the journal; fields beyond this limit are silently dropped (but the initial part of the message sent). This was implemented in the previous patch, here we just increase the limit to 32 fields total. Signed-off-by: Miloslav Trmač <mitr(a)redhat.com> --- This version drops logging the str[123] and int[12] fields. The META_ADD_STRING macro is unused; it was left there just to demonstrate the use of the API in case someone wanted to add more error-specific information. --- src/util/logging.c | 13 +++++++++++-- src/util/virterror.c | 23 ++++++++++++++++++++++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/util/logging.c b/src/util/logging.c index e8fed55..dbffaa1 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -1125,7 +1125,7 @@ virLogOutputToJournald(virLogSource source, int linenr, const char *funcname, const char *timestamp ATTRIBUTE_UNUSED, - virLogMetadataPtr metadata ATTRIBUTE_UNUSED, + virLogMetadataPtr metadata, unsigned int flags, const char *rawstr, const char *str ATTRIBUTE_UNUSED, @@ -1145,7 +1145,7 @@ virLogOutputToJournald(virLogSource source, * and where unprivileged users can create files. */ char path[] = "/dev/shm/journal.XXXXXX"; -# define NUM_FIELDS 6 +# define NUM_FIELDS 32 struct iovec iov[NUM_FIELDS * 5]; char iov_bufs[NUM_FIELDS][JOURNAL_BUF_SIZE]; struct journalState state; @@ -1162,6 +1162,15 @@ virLogOutputToJournald(virLogSource source, journalAddString(&state, "CODE_FILE", filename); journalAddInt(&state, "CODE_LINE", linenr); journalAddString(&state, "CODE_FUNC", funcname); + if (metadata != NULL) { + while (metadata->key != NULL) { + if (metadata->s != NULL) + journalAddString(&state, metadata->key, metadata->s); + else + journalAddInt(&state, metadata->key, metadata->i); + metadata++; + } + } memset(&sa, 0, sizeof(sa)); sa.sun_family = AF_UNIX; diff --git a/src/util/virterror.c b/src/util/virterror.c index 213188e..10b627f 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -619,6 +619,8 @@ virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, virErrorPtr to; char *str; int priority; + virLogMetadata meta[3]; + size_t i; /* * All errors are recorded in thread local storage @@ -676,10 +678,29 @@ virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, priority = virErrorLevelPriority(level); if (virErrorLogPriorityFilter) priority = virErrorLogPriorityFilter(to, priority); + + i = 0; +#define META_ADD_STRING(KEY, VALUE) \ + do { \ + meta[i].key = (KEY); \ + meta[i].s = (VALUE); \ + i++; \ + } while (0) +#define META_ADD_INT(KEY, VALUE) \ + do { \ + meta[i].key = (KEY); \ + meta[i].s = NULL; \ + meta[i].i = (VALUE); \ + i++; \ + } while (0) + + META_ADD_INT("DOMAIN", domain); + META_ADD_INT("CODE", code); + meta[i].key = NULL; virLogMessage(virErrorLogPriorityFilter ? VIR_LOG_FROM_FILE : VIR_LOG_FROM_ERROR, priority, filename, linenr, funcname, - NULL, "%s", str); + meta, "%s", str); errno = save_errno; } -- 1.7.11.7

1 0

[libvirt] [PATCHv2 0/2] S390: Adding support for SCLP Console
by Viktor Mihajlovski 27 Nov '12

27 Nov '12

The S390 architecture comes with a native console type (SCLP console) which is now also supported by current QEMU. This series is enabling libvirt to configure S390 domains with SCLP consoles. The domain XML has to be extended for the new console target types 'sclp' and 'sclplm' (line mode = dumb). As usual the QEMU driver must do capability probing in order to find out whether SCLP is supported and format the QEMU command line for the new console type. V2 Changes: Rebased to current master, resolving conflicts. J.B. Joret (2): S390: Add SCLP console front end support S390: Enable SCLP Console in QEMU driver docs/formatdomain.html.in | 19 ++++++- docs/schemas/domaincommon.rng | 2 + src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 59 ++++++++++++++++++++++ .../qemuxml2argv-console-sclp.args | 8 +++ .../qemuxml2argvdata/qemuxml2argv-console-sclp.xml | 24 +++++++++ tests/qemuxml2argvtest.c | 3 ++ 10 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-sclp.xml -- 1.7.12.4

1 2

[libvirt] [PATCH v4] qemu: Allow the user to specify vendor and product for disk
by Osier Yang 26 Nov '12

26 Nov '12

QEMU supports setting vendor and product strings for disk since 1.2.0 (only scsi-disk, scsi-hd, scsi-cd support it), this patch exposes it with new XML elements <vendor> and <product> of disk device. v3 - v4: * Per Paolo's feedback, allows all printable chars. --- docs/formatdomain.html.in | 11 +++++ docs/schemas/domaincommon.rng | 14 ++++++ src/conf/domain_conf.c | 44 ++++++++++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 29 +++++++++++++ src/util/util.c | 12 +++++ src/util/util.h | 1 + ...qemuxml2argv-disk-scsi-disk-vpd-build-error.xml | 35 ++++++++++++++++ .../qemuxml2argv-disk-scsi-disk-vpd.args | 13 ++++++ .../qemuxml2argv-disk-scsi-disk-vpd.xml | 38 +++++++++++++++++ tests/qemuxml2argvtest.c | 8 ++++ tests/qemuxml2xmltest.c | 2 + 13 files changed, 210 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6a3b976..903c069 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1657,6 +1657,17 @@ of 16 hexadecimal digits. Since 0.10.1 </dd> + <dt><code>vendor</code></dt> + <dd>If present, this element specifies the vendor of a virtual hard + disk or CD-ROM device. It must not be longer than 8 printable + characters. + Since 1.0.1 + </dd> + <dt><code>product</code></dt> + <dd>If present, this element specifies the product of a virtual hard + disk or CD-ROM device. It must not be longer than 16 printable + Since 1.0.1 + </dd> <dt><code>host</code></dt> <dd>The <code>host</code> element has two attributes "name" and "port", which specify the hostname and the port number. The meaning of this diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 02ad477..19bf597 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -905,6 +905,20 @@ <ref name="wwn"/> </element> </optional> + <optional> + <element name="vendor"> + <data type="string"> + <param name="pattern">[x20-x7E]{0,8}</param> + </data> + </element> + </optional> + <optional> + <element name="product"> + <data type="string"> + <param name="pattern">[x20-x7E]{0,16}</param> + </data> + </element> + </optional> </interleave> </define> <define name="snapshot"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 047c4fc..e975f74 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -979,6 +979,8 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def) VIR_FREE(def->mirror); VIR_FREE(def->auth.username); VIR_FREE(def->wwn); + VIR_FREE(def->vendor); + VIR_FREE(def->product); if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_USAGE) VIR_FREE(def->auth.secret.usage); virStorageEncryptionFree(def->encryption); @@ -3490,6 +3492,8 @@ cleanup: goto cleanup; } +#define VENDOR_LEN 8 +#define PRODUCT_LEN 16 /* Parse the XML definition for a disk * @param node XML nodeset to parse for disk definition @@ -3542,6 +3546,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, char *logical_block_size = NULL; char *physical_block_size = NULL; char *wwn = NULL; + char *vendor = NULL; + char *product = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -3880,6 +3886,36 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (!virValidateWWN(wwn)) goto error; + } else if (!vendor && + xmlStrEqual(cur->name, BAD_CAST "vendor")) { + vendor = (char *)xmlNodeGetContent(cur); + + if (strlen(vendor) > VENDOR_LEN) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk vendor is more than 8 characters")); + goto error; + } + + if (!virStrIsPrint(vendor)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk vendor is not printable string")); + goto error; + } + } else if (!product && + xmlStrEqual(cur->name, BAD_CAST "product")) { + product = (char *)xmlNodeGetContent(cur); + + if (strlen(vendor) > PRODUCT_LEN) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk product is more than 16 characters")); + goto error; + } + + if (!virStrIsPrint(product)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk product is not printable string")); + goto error; + } } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ } @@ -4176,6 +4212,10 @@ virDomainDiskDefParseXML(virCapsPtr caps, serial = NULL; def->wwn = wwn; wwn = NULL; + def->vendor = vendor; + vendor = NULL; + def->product = product; + product = NULL; if (driverType) { def->format = virStorageFileFormatTypeFromString(driverType); @@ -4249,6 +4289,8 @@ cleanup: VIR_FREE(logical_block_size); VIR_FREE(physical_block_size); VIR_FREE(wwn); + VIR_FREE(vendor); + VIR_FREE(product); ctxt->node = save_ctxt; return def; @@ -12085,6 +12127,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAddLit(buf, " <transient/>\n"); virBufferEscapeString(buf, " <serial>%s</serial>\n", def->serial); virBufferEscapeString(buf, " <wwn>%s</wwn>\n", def->wwn); + virBufferEscapeString(buf, " <vendor>%s</vendor>\n", def->vendor); + virBufferEscapeString(buf, " <product>%s</product>\n", def->product); if (def->encryption) { virBufferAdjustIndent(buf, 6); if (virStorageEncryptionFormat(buf, def->encryption) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c3e8c16..e3522a5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -591,6 +591,8 @@ struct _virDomainDiskDef { char *serial; char *wwn; + char *vendor; + char *product; int cachemode; int error_policy; /* enum virDomainDiskErrorPolicy */ int rerror_policy; /* enum virDomainDiskErrorPolicy */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 756d7bd..8a1f9df 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1280,6 +1280,7 @@ virSetUIDGID; virSkipSpaces; virSkipSpacesAndBackslash; virSkipSpacesBackwards; +virStrIsPrint; virStrToDouble; virStrToLong_i; virStrToLong_l; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 02e105d..2217ccd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2428,6 +2428,13 @@ qemuBuildDriveDevStr(virDomainDefPtr def, } } + if ((disk->vendor || disk->product) && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only scsi disk supports vendor and product")); + goto error; + } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { /* make sure that both the bus and the qemu binary support * type='lun' (SG_IO). @@ -2455,6 +2462,11 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("Setting wwn is not supported for lun device")); goto error; } + if (disk->vendor || disk->product) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product is not supported for lun device")); + goto error; + } } switch (disk->bus) { @@ -2504,6 +2516,17 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } + /* Properties wwn, vendor and product were introduced in the + * same QEMU release (1.2.0). + */ + if ((disk->vendor || disk->product) && + !qemuCapsGet(caps, QEMU_CAPS_SCSI_DISK_WWN)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product for scsi disk is not " + "supported by this QEMU")); + goto error; + } + controllerModel = virDomainDiskFindControllerModel(def, disk, VIR_DOMAIN_CONTROLLER_TYPE_SCSI); @@ -2649,6 +2672,12 @@ qemuBuildDriveDevStr(virDomainDefPtr def, if (disk->wwn) virBufferAsprintf(&opt, ",wwn=%s", disk->wwn); + if (disk->vendor) + virBufferAsprintf(&opt, ",vendor=%s", disk->vendor); + + if (disk->product) + virBufferAsprintf(&opt, ",product=%s", disk->product); + if (virBufferError(&opt)) { virReportOOMError(); goto error; diff --git a/src/util/util.c b/src/util/util.c index 75b18c1..ea5d12e 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -3114,3 +3114,15 @@ virValidateWWN(const char *wwn) { return true; } + +bool +virStrIsPrint(const char *str) +{ + int i; + + for (i = 0; str[i]; i++) + if (!c_isprint(str[i])) + return false; + + return true; +} diff --git a/src/util/util.h b/src/util/util.h index 4316ab1..6d5dd03 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -280,4 +280,5 @@ bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1); bool virValidateWWN(const char *wwn); +bool virStrIsPrint(const char *str); #endif /* __VIR_UTIL_H__ */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml new file mode 100644 index 0000000..ca68275 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='virtio'/> + <vendor>SEAGATE</vendor> + <product>ST3146707LC</product> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args new file mode 100644 index 0000000..f5c1999 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -0,0 +1,13 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-device lsi,id=scsi1,bus=pci.0,addr=0x4 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ +id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi1-0-0 \ +-device scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,\ +id=scsi1-0-0,vendor=SEAGATE,product=ST3567807GD \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml new file mode 100644 index 0000000..96786e3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml @@ -0,0 +1,38 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='scsi'/> + <readonly/> + <vendor>SEAGATE</vendor> + <product>ST3146707LC</product> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <readonly/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + <address type='drive' controller='1' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4cccbb0..1f69b6c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -505,6 +505,14 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST("disk-scsi-disk-vpd", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-virtio-scsi", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 1d366f1..88ef050 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -239,6 +239,8 @@ mymain(void) DO_TEST("seclabel-none"); DO_TEST("numad-static-vcpu-no-numatune"); + DO_TEST("disk-scsi-disk-vpd"); + /* These tests generate different XML */ DO_TEST_DIFFERENT("balloon-device-auto"); DO_TEST_DIFFERENT("channel-virtio-auto"); -- 1.7.7.6

1 1

[libvirt] [PATCH] lxc: Avoid segfault of libvirt_lxc helper on early cleanup paths
by Peter Krempa 26 Nov '12

26 Nov '12

Early jumps to the cleanup label caused a crash of the libvirt_lxc container helper as the cleanup section called virLXCControllerDeleteInterfaces(ctrl) without checking the ctrl argument for NULL. The argument was de-referenced soon after. $ /usr/libexec/libvirt_lxc /usr/libexec/libvirt_lxc: missing --name argument for configuration Segmentation fault --- src/lxc/lxc_controller.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index a9d2d40..ea5bc58 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1672,7 +1672,8 @@ int main(int argc, char *argv[]) cleanup: virPidFileDelete(LXC_STATE_DIR, name); - virLXCControllerDeleteInterfaces(ctrl); + if (ctrl) + virLXCControllerDeleteInterfaces(ctrl); for (i = 0 ; i < nttyFDs ; i++) VIR_FORCE_CLOSE(ttyFDs[i]); VIR_FREE(ttyFDs); -- 1.8.0

2 2

[libvirt] [PATCH] lxc: Don't crash if no security driver is specified in libvirt_lxc
by Peter Krempa 26 Nov '12

26 Nov '12

When no security driver is specified libvirt_lxc segfaults as a debug message tries to access security labels for the container that are not present. This problem was introduced in commit 6c3cf57d6cb27cf10064baf8cca0f39. --- src/lxc/lxc_controller.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index ea5bc58..16cda9d 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1612,11 +1612,15 @@ int main(int argc, char *argv[]) false, false, false))) goto cleanup; - VIR_DEBUG("Security model %s type %s label %s imagelabel %s", - NULLSTR(ctrl->def->seclabels[0]->model), - virDomainSeclabelTypeToString(ctrl->def->seclabels[0]->type), - NULLSTR(ctrl->def->seclabels[0]->label), - NULLSTR(ctrl->def->seclabels[0]->imagelabel)); + if (ctrl->def->seclabels) { + VIR_DEBUG("Security model %s type %s label %s imagelabel %s", + NULLSTR(ctrl->def->seclabels[0]->model), + virDomainSeclabelTypeToString(ctrl->def->seclabels[0]->type), + NULLSTR(ctrl->def->seclabels[0]->label), + NULLSTR(ctrl->def->seclabels[0]->imagelabel)); + } else { + VIR_DEBUG("Security model not initialized"); + } ctrl->veths = veths; ctrl->nveths = nveths; -- 1.8.0

2 2

[libvirt] [test-API][PATCH] Add managedsave test cases
by hongming 26 Nov '12

26 Nov '12

The managedsave test cases and test suite cover test include verifying virsh commands managedsave(include all flags and their combination)/managedsave-remove and managedSaveRemove/ManagedSave/ hasManagedSaveImage python APIs. The following new files be created. new file: cases/managedsave.conf - Test all test cases new file: repos/managedsave/__init__.py new file: repos/managedsave/managedsave.py - Test mangaedsave command/API and all flags new file: repos/managedsave/managedsave_remove.py - Test managedsave-remove command/API new file: repos/managedsave/managedsave_start.py - Verfiy managedsave'flags and start from managedsave image --- cases/managedsave.conf | 63 ++++++++++++ repos/managedsave/managedsave.py | 162 +++++++++++++++++++++++++++++++ repos/managedsave/managedsave_remove.py | 61 ++++++++++++ repos/managedsave/managedsave_start.py | 152 +++++++++++++++++++++++++++++ 4 files changed, 438 insertions(+), 0 deletions(-) create mode 100644 cases/managedsave.conf create mode 100644 repos/managedsave/__init__.py create mode 100644 repos/managedsave/managedsave.py create mode 100644 repos/managedsave/managedsave_remove.py create mode 100644 repos/managedsave/managedsave_start.py diff --git a/cases/managedsave.conf b/cases/managedsave.conf new file mode 100644 index 0000000..8dcafe2 --- /dev/null +++ b/cases/managedsave.conf @@ -0,0 +1,63 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + macaddr + 54:52:00:4a:16:30 + +#VIR_DOMAIN_SAVE_BYPASS_CACHE = 1 +#VIR_DOMAIN_SAVE_RUNNING = 2 +#VIR_DOMAIN_SAVE_PAUSED = 4 +#No_FLAGS = 0 +managedsave:managedsave + guestname + $defaultname + flags + 1|2 + +managedsave:managedsave_start + guestname + $defaultname + flags + noping + +managedsave:managedsave + guestname + $defaultname + flags + 1|4 + +managedsave:managedsave_start + guestname + $defaultname + flags + noping + +managedsave:managedsave + guestname + $defaultname + flags + 0 + +managedsave:managedsave_remove + guestname + $defaultname + +managedsave:managedsave_start + guestname + $defaultname + flags + noping diff --git a/repos/managedsave/__init__.py b/repos/managedsave/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/repos/managedsave/managedsave.py b/repos/managedsave/managedsave.py new file mode 100644 index 0000000..5e7c105 --- /dev/null +++ b/repos/managedsave/managedsave.py @@ -0,0 +1,162 @@ +#!/usr/bin/env python + +import os +import math + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'flags',) +optional_params = {} + +def check_guest_status(*args): + """Check guest current status""" + (domobj, logger) = args + state = domobj.info()[0] + logger.debug("current guest status: %s" % state) + + if state == libvirt.VIR_DOMAIN_SHUTOFF or \ + state == libvirt.VIR_DOMAIN_SHUTDOWN or \ + state == libvirt.VIR_DOMAIN_BLOCKED: + return False + else: + return True + +def check_savefile_create(*args): + """Check guest's managed save file be created""" + + (guestname) = args + cmds = "ls /var/lib/libvirt/qemu/save/%s" % guestname + ".save -lh" + logger.info("Execute cmd %s" % cmds) + (status, output) = utils.exec_cmd(cmds, shell=True) + if status != 0: + logger.error("No managed save file") + return False + else : + logger.info("managed save file exists") + return True + +def compare_cachedfile(cachebefore, cacheafter): + """Compare cached value before managed save and its value after + managed save """ + + diff = cacheafter - cachebefore + logger.info("diff is %s " % diff) + percent = math.fabs(diff)/cachebefore + logger.info("diff percent is %s " % percent) + if math.fabs(diff)/cachebefore < 0.05: + return True + else: + return False + +def get_cachevalue(): + """Get the file system cached value """ + + cmds = "head -n4 /proc/meminfo|grep Cached|awk '{print $2}'" + (status, output) = utils.exec_cmd(cmds, shell=True) + if status != 0: + logger.error("failed to run cmd line to get cache") + return 1 + else: + logger.debug(output[0]) + cachevalue= int(output[0]) + return cachevalue + +def managedsave(params): + """Managed save a running domain""" + + global logger + logger = params['logger'] + guestname = params['guestname'] + flags = params ['flags'] + #Save given flags to sharedmod.data + sharedmod.data['flagsave'] = flags + + logger.info("The given flags are %s " % flags) + if not '|' in flags: + flagn = int(flags) + else: + flagstr = flags.split('|') + flagcont = ''.join(flagstr) + length = len(flagcont) + # bitwise-OR of flags of managedsave + flagn = int(flagcont[0]) + for i in range(0,length-1): + flagn = flagn |int(flagcont[i+1]) + + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) + + if not check_guest_status(domobj, logger): + logger.error("Error: current guest status is shutoff") + return 1 + + try: + + logger.info("bitwise OR value of flags is %s" % flagn) + + if flagn == 0: + logger.info("managedsave %s domain with no flag" % guestname) + elif flagn == 1: + logger.info("managedsave %s domain --bypass-cache" % guestname) + elif flagn == 2: + logger.info("managedsave %s domain --running" % guestname) + elif flagn == 3: + logger.info("managedsave %s domain --running --bypass-cache"\ + % guestname) + elif flagn == 4: + logger.info("managedsave %s domain --paused" % guestname) + elif flagn == 5: + logger.info("managedsave %s domain --paused --bypass-cache"\ + % guestname) + elif flagn == 6: + logger.error("Error:--running and --paused are mutually exclusive") + return 1 + elif flagn == 7: + logger.error("Error:--running and --paused are mutually exclusive") + return 1 + else: + logger.error("Error:Wrong flags be given and fail to \ + managedsave domain") + return 1 + + #If given flags include bypass-cache,check if bypass file system cache + if flagn %2 == 1: + logger.info("Given flags include --bypass-cache") + os.system('echo 3 > /proc/sys/vm/drop_caches') + cache_before = get_cachevalue() + logger.info("Cached value before managedsave is %s" % cache_before) + + domobj.managedSave(flagn) + + cache_after = get_cachevalue() + logger.info("Cached value after managedsave is %s" % cache_after) + + if compare_cachedfile(cache_before, cache_after): + logger.info("Bypass file system cache successfully") + else: + logger.error("Bypass file system cache failed") + return 1 + else: + domobj.managedSave(flagn) + + #Check if domain has managedsave image + if domobj.hasManagedSaveImage(0) and \ + domobj.info()[0]==libvirt.VIR_DOMAIN_SHUTOFF and \ + check_savefile_create(guestname): + logger.info("Domain %s managedsave successfully " % guestname) + else: + logger.error("Error: fail to managedsave domain") + return 1 + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % e.message) + logger.error("Error: fail to managedsave %s domain" % guestname) + return 1 + + return 0 + diff --git a/repos/managedsave/managedsave_remove.py b/repos/managedsave/managedsave_remove.py new file mode 100644 index 0000000..143312f --- /dev/null +++ b/repos/managedsave/managedsave_remove.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python +# Save domain as a statefile + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname',) +optional_params = {} + +def check_savefile_remove(*args): + """Check if guest's managedsave file be removed """ + + (guestname) = args + cmds = "ls /var/lib/libvirt/qemu/save/%s" % guestname + ".save -lh" + logger.info("Execute cmd %s" % cmds) + (status, output) = utils.exec_cmd(cmds, shell=True) + if status != 0: + logger.info("No managed save file") + return True + else : + logger.error("managed save file exits") + return False + + +def managedsave_remove(params): + """Remove an existing managed save state file from a domain""" + + global logger + logger = params['logger'] + guestname = params['guestname'] + + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) + + if not domobj.hasManagedSaveImage(0) and check_savefile_remove(guestname): + logger.info("Domain %s hasn't managedsave image" % guestname) + return 1 + else: + logger.info("Domain %s has managedsave image" % guestname) + + try: + domobj.managedSaveRemove(0) + #Check if domain has managedsave image + if not domobj.hasManagedSaveImage(0) and \ + check_savefile_remove(guestname): + logger.info("Domain %s's managedsave image has been removed"\ + % guestname) + else: + logger.error("Error: fail to remove managedsave domain") + return 1 + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" % e.message) + logger.error("Error: fail to managedsave %s domain" % guestname) + return 1 + + return 0 + diff --git a/repos/managedsave/managedsave_start.py b/repos/managedsave/managedsave_start.py new file mode 100644 index 0000000..f5da0b3 --- /dev/null +++ b/repos/managedsave/managedsave_start.py @@ -0,0 +1,152 @@ +#!/usr/bin/env python + +import time + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname',) +optional_params = {'flags' : ''} + +NONE = 0 +START_PAUSED = 1 +START_BYPASS_CACHE = 4 +START_FORCE_BOOT = 8 + +def check_savefile_remove(*args): + """Check guest managed save file""" + (guestname) = args + cmds = "ls /var/lib/libvirt/qemu/save/%s" % guestname + ".save -lh" + logger.info("Execute cmd %s" % cmds) + (status, output) = utils.exec_cmd(cmds, shell=True) + if status != 0: + logger.info("No managed save file") + return True + else : + logger.error("managed save file exists") + return False + +def managedsave_start(params): + """ Start domain with managedsave image and check if its status is rigth + according to given flags of running managedsave command.If it is + correctly paused , resume it. + + Argument is a dictionary with two keys: + {'logger': logger, 'guestname': guestname} + + logger -- an object of utils/log.py + mandatory arguments : guestname -- same as the domain name + optional arguments : flags -- domain create flags <none|start_paused + |noping>.It allows only one flag be given. + + Return 0 on SUCCESS or 1 on FAILURE + """ + domname = params['guestname'] + global logger + logger = params['logger'] + flags = params.get('flags', '') + # Get given flags of managedsave + if sharedmod.data.has_key('flagsave'): + flagsave = sharedmod.data.get('flagsave') + else: + logger.error("Failed to get flags from managedsave") + # Clean sharedmod.data + sharedmod.data = {} + + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(domname) + + timeout = 600 + logger.info('start domain') + # Check if guest has managedsave image before start + if domobj.hasManagedSaveImage(0) : + logger.info("Domain has managedsave image") + else: + logger.info("Domain hasn't managedsave image") + + try: + if "none" in flags: + domobj.createWithFlags(NONE) + elif "start_paused" in flags: + domobj.createWithFlags(START_PAUSED) + else: + # this covers flags = None as well as flags = 'noping' + domobj.create() + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % e.message) + logger.error("start failed") + return 1 + + while timeout: + state = domobj.info()[0] + expect_states = [libvirt.VIR_DOMAIN_RUNNING,libvirt.VIR_DOMAIN_PAUSED,\ + libvirt.VIR_DOMAIN_NOSTATE,libvirt.VIR_DOMAIN_BLOCKED] + + if state in expect_states: + break + + time.sleep(10) + timeout -= 10 + logger.info(str(timeout) + "s left") + + if timeout <= 0: + logger.error('The domain state is not as expected, state: ' + state) + return 1 + + logger.info("Guest started") + + """If domain's current state is paused. Check if start command has + --paused flag or managedsave has --paused flag (given flags in managedsave + include '4'). If yes, it means domain successfully paused , then resume it. + If not, throw error -guest state error.""" + + if state == libvirt.VIR_DOMAIN_PAUSED: + if "start_paused" in flags or "4" in flagsave: + logger.info("Guest paused successfully ") + + try: + domobj.resume() + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % e.message) + logger.error("resume failed") + return 1 + stateresume = domobj.info()[0] + expect_states = [libvirt.VIR_DOMAIN_RUNNING, \ + libvirt.VIR_DOMAIN_NOSTATE, \ + libvirt.VIR_DOMAIN_BLOCKED] + if stateresume not in expect_states: + logger.error('The domain state is not equal to "paused"') + return 1 + else: + logger.info('Domain resume successfully') + return 0 + else: + logger.error("guest state error") + return 1 + + # Get domain ip and ping ip to check domain's status + if not "noping" in flags: + mac = utils.get_dom_mac_addr(domname) + logger.info("get ip by mac address") + ip = utils.mac_to_ip(mac, 180) + + logger.info('ping guest') + if not utils.do_ping(ip, 300): + logger.error('Failed on ping guest, IP: ' + str(ip)) + return 1 + + # Check if domain' managedsave image exists,if not, return 0. + if not domobj.hasManagedSaveImage(0) and check_savefile_remove(domname): + logger.info("Domain %s with managedsave image successfully start" \ + % domname) + return 0 + else: + logger.info("Failed to start domain s% with managedsave image" \ + % domname) + return 1 -- 1.7.7.6

2 1

[libvirt] [PATCH] cpu: Add Intel Haswell cpu model
by Peter Krempa 26 Nov '12

26 Nov '12

The new model supports following features in addition to those supported by SandyBridge: fma, movbe, fsgsbase, bmi1, hle, avx2, smep, bmi2, erms, invpcid, rtm --- Based on: https://lists.gnu.org/archive/html/qemu-devel/2012-11/msg01328.html --- src/cpu/cpu_map.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 7ff91be..eb69a34 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -495,6 +495,22 @@ <feature name='rdtscp'/> </model> + <model name='Haswell'> + <model name='SandyBridge'/> + <feature name='fma'/> + <feature name='pcid'/> + <feature name='movbe'/> + <feature name='fsgsbase'/> + <feature name='bmi1'/> + <feature name='hle'/> + <feature name='avx2'/> + <feature name='smep'/> + <feature name='bmi2'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='rtm'/> + </model> +  <model name='athlon'> <model name='pentiumpro'/> -- 1.8.0

2 4

[libvirt] [PATCH] storage: fix logical volume cloning
by Ján Tomko 26 Nov '12

26 Nov '12

Commit 258e06c removed setting of the volume type to VIR_STORAGE_VOL_BLOCK, which leads to failures in storageVolumeCreateXMLFrom. The type (and target.format) of the volume was set to zero. In virStorageBackendGetBuildVolFromFunction, this gets interpreted as VIR_STORAGE_FILE_NONE and the qemu-img tool is called with unknown "none" format. Bug: https://bugzilla.redhat.com/show_bug.cgi?id=879780 --- src/storage/storage_backend_logical.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index de43c3a..fd5cbd1 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -708,6 +708,8 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, return -1; } + vol->type = VIR_STORAGE_VOL_BLOCK; + if (vol->target.path != NULL) { /* A target path passed to CreateVol has no meaning */ VIR_FREE(vol->target.path); -- 1.7.8.6

3 2

[libvirt] [PATCH] build: fix build --without-network
by Ján Tomko 26 Nov '12

26 Nov '12

bridge_driver.h: silence gcc warnings: statement with no effect [-Wunused-value] unused variable 'net' [-Wunused-variable] virdrivermoduletest.c: don't require network driver module if it hasn't been built. --- src/network/bridge_driver.h | 4 ++-- tests/virdrivermoduletest.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 0fae275..1c42d81 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -53,8 +53,8 @@ int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, # else /* Define no-op replacements that don't drag in any link dependencies. */ # define networkAllocateActualDevice(iface) 0 -# define networkNotifyActualDevice(iface) 0 -# define networkReleaseActualDevice(iface) 0 +# define networkNotifyActualDevice(iface) (iface=iface,0) +# define networkReleaseActualDevice(iface) (iface=iface,0) # define networkGetNetworkAddress(netname, netaddr) (-2) # define networkBuildDhcpDaemonCommandLine(network, cmdout, pidfile, dctx) 0 # endif diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c index 9c14e79..0123c36 100644 --- a/tests/virdrivermoduletest.c +++ b/tests/virdrivermoduletest.c @@ -83,10 +83,18 @@ mymain(void) TEST("interface", NULL); #endif #ifdef WITH_QEMU +# ifdef WITH_NETWORK TEST("qemu", "network"); +# else + TEST("qemu", NULL); +# endif #endif #ifdef WITH_LXC +# ifdef WITH_NETWORK TEST("lxc", "network"); +# else + TEST("lxc", NULL); +# endif #endif #ifdef WITH_UML TEST("uml", NULL); -- 1.7.8.6

4 3

[libvirt] libvirt [PATCHv2 0/2] Refactor ESX storage driver and append support for iSCSI devices.
by Ata E Husain Bohra 26 Nov '12

26 Nov '12

Major changes: Split changes to two parts: a. Refactor ESX storage driver to implement facade design. b. Add backend driver to support iSCSI devices. Ata E Husain Bohra (2): Refactor ESX storage driver to implement facade pattern Add iSCSI backend storage driver for ESX. daemon/remote.c | 6 +- src/Makefile.am | 2 + src/conf/storage_conf.c | 3 +- src/datatypes.c | 25 +- src/datatypes.h | 24 +- src/esx/esx_driver.c | 6 +- src/esx/esx_storage_backend_iscsi.c | 807 +++++++++++++++++++ src/esx/esx_storage_backend_iscsi.h | 29 + src/esx/esx_storage_backend_vmfs.c | 1491 +++++++++++++++++++++++++++++++++++ src/esx/esx_storage_backend_vmfs.h | 30 + src/esx/esx_storage_driver.c | 1325 +++++-------------------------- src/esx/esx_vi.c | 337 +++++++- src/esx/esx_vi.h | 21 +- src/esx/esx_vi_generator.input | 302 +++++++ src/esx/esx_vi_generator.py | 19 + src/parallels/parallels_storage.c | 24 +- src/remote/remote_driver.c | 6 +- src/storage/storage_driver.c | 28 +- src/test/test_driver.c | 30 +- src/vbox/vbox_tmpl.c | 14 +- 20 files changed, 3357 insertions(+), 1172 deletions(-) create mode 100644 src/esx/esx_storage_backend_iscsi.c create mode 100644 src/esx/esx_storage_backend_iscsi.h create mode 100644 src/esx/esx_storage_backend_vmfs.c create mode 100644 src/esx/esx_storage_backend_vmfs.h -- 1.7.9.5

3 2

[libvirt] [PATCH 0/6 v2] Unprivileged SG_IO support
by Osier Yang 26 Nov '12

26 Nov '12

Hi, As a result of RFC [1], this implements the unprivleged SG_IO support. Though it is a bit rushed, and I still have no chance to test it yet, but I'd like see an earlier reviewing. @Paolo, please let me known once you have a kernel build with the new sysfs knob supported. Thanks! Osier Yang (6): unpriv_sgio: Add docs and rng schema for new XML unpriv_sgio unpriv_sgio: Parse and format the new XML unpriv_sgio: Prepare helpers for unpriv_sgio setting unpriv_sgio: Manage unpriv_sgio in domain's lifecyle unpriv_sgio: Do not restore unpriv_sgio if the disk is being used unpriv_sgio: Error out if the unpriv_sgio setting conflicts with others docs/formatdomain.html.in | 10 +- docs/schemas/domaincommon.rng | 52 ++++-- src/conf/domain_conf.c | 168 ++++++++++++++++++-- src/conf/domain_conf.h | 18 ++ src/libvirt_private.syms | 6 + src/qemu/qemu_process.c | 54 +++++++ src/util/util.c | 154 ++++++++++++++++++ src/util/util.h | 7 + ...l2argv-disk-scsi-lun-passthrough-upriv-sgio.xml | 32 ++++ tests/qemuxml2xmltest.c | 1 + 10 files changed, 472 insertions(+), 30 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-upriv-sgio.xml [1] https://www.redhat.com/archives/libvir-list/2012-November/msg00988.html Regards, Osier

1 6

[libvirt] [PATCH] util: Use virReportSystemError for system error in pci.c
by Osier Yang 26 Nov '12

26 Nov '12

--- src/util/pci.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index d1ad121..191f99d 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -1860,10 +1860,9 @@ pciGetPciConfigAddressFromSysfsDeviceLink(const char *device_link, device_path = canonicalize_file_name(device_link); if (device_path == NULL) { memset(errbuf, '\0', sizeof(errbuf)); - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to resolve device link '%s': '%s'"), - device_link, virStrerror(errno, errbuf, - sizeof(errbuf))); + virReportSystemError(errno, + _("Failed to resolve device link '%s'"), + device_link); return ret; } @@ -1941,10 +1940,9 @@ pciGetVirtualFunctions(const char *sysfs_path, dir = opendir(sysfs_path); if (dir == NULL) { memset(errbuf, '\0', sizeof(errbuf)); - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to open dir '%s': '%s'"), - sysfs_path, virStrerror(errno, errbuf, - sizeof(errbuf))); + virReportSystemError(errno, + _("Failed to open dir '%s'"), + sysfs_path); return ret; } -- 1.7.7.6

2 2

[libvirt] [PATCH] util: Fix the indention
by Osier Yang 25 Nov '12

25 Nov '12

--- Pushed under trivial rule. --- src/util/cgroup.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 3f7b5f7..41a6e4a 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -1189,10 +1189,10 @@ int virCgroupSetBlkioDeviceWeight(virCgroupPtr group, return ret; } #else - int - virCgroupSetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned int weight ATTRIBUTE_UNUSED) +int +virCgroupSetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED, + const char *path ATTRIBUTE_UNUSED, + unsigned int weight ATTRIBUTE_UNUSED) { return -ENOSYS; } -- 1.7.7.6

1 0

[libvirt] image transfer incompletely in live migration
by yli＠cloudiya.com 25 Nov '12

25 Nov '12

Hi, I am using libvirt version 0.10.1 and qemu-kvm version 1.2.0 with RHEL 6.3 When I use libvirt API to make block migrate with a VM, it failed frequently. I check the migrated VM and found that the filesystem damaged. But sometimes it works very fine, I don't know why, it seems to be random. All failed tests have the same condition, image transfer incompletely in live migration. The image I used is 10GB size, after a failed migration it has only about 400MB to 3GB in remote host. Here is the code: import libvirt from xml.dom import minidom name = "vm-01" host = libvirt.open("qemu:///system") vm = host.lookupByNmae(name) vm_xml_file = "/etc/libvirt/qemu/%s.xml" % name vm_xml = minidom.parse(vm_xml_file).documentElement.toxml() remote_host = "qemu+ssh://host02/system" remote = libvirt.open(remote_host) try: vm.migrate2(remote, vm_xml, 89, name, None, 0) except Exception,e: print str(e) Before run the code I have already create a image for migration in remote host 'host02'. Path, size, and privilege all OK. Here is the related log: in source host 'host01': 2012-11-24 05:14:40.001+0000: 24888: warning : qemuDomainObjBeginJobInternal:838 : Cannot start job (query, none) for domain wrksp-776; current job is (async nested, migration out) owned by (24890, 24890) 2012-11-24 05:16:16.398+0000: 24888: error : qemuDomainObjBeginJobInternal:842 : Timed out during operation: cannot acquire state change lock 2012-11-24 05:16:21.317+0000: 24887: error : virNetSocketReadWire:1184 : End of file while reading data: Input/output error in remote host 'host02': 2012-11-24 05:14:00.776+0000: 11065: warning : qemuDomainObjEnterMonitorInternal:993 : This thread seems to be the async job owner; entering monitor without asking for a nested job is dangerous 2012-11-24 05:14:01.196+0000: 11065: warning : qemuDomainObjEnterMonitorInternal:993 : This thread seems to be the async job owner; entering monitor without asking for a nested job is dangerous 2012-11-24 05:14:01.198+0000: 11065: warning : qemuDomainObjEnterMonitorInternal:993 : This thread seems to be the async job owner; entering monitor without asking for a nested job is dangerous 2012-11-24 05:14:01.208+0000: 11065: warning : qemuDomainObjEnterMonitorInternal:993 : This thread seems to be the async job owner; entering monitor without asking for a nested job is dangerous 2012-11-24 05:14:01.211+0000: 11065: warning : qemuDomainObjEnterMonitorInternal:993 : This thread seems to be the async job owner; entering monitor without asking for a nested job is dangerous I try to use command "virsh migrate vm-01 --live --copy-storage-all --persistent --undefinesource qemu+ssh://host02/system --verbose", the test results have no change, common but not regular. Even after my once successful test, it will certainly fail when I try to make a second migrate with the same VM. How can I solve this problem？ Anything is helpful. Thanks.

1 0

[libvirt] [PATCH 0/6] Misc unrelated fixes
by Daniel P. Berrange 25 Nov '12

25 Nov '12

The following are miscellaneous patches fixes various issues I've come across today, while hacking on LXC

4 12

[libvirt] [BUG] storage.xml: owner|group=-1 → 2^32-1 on 32 Bit
by Philipp Hahn 24 Nov '12

24 Nov '12

Hello, when you install and use libvirt in a 32 bit environment, the handling of owner and group in /etc/libvirt/storage/*.xml is broken: The initial -1 is printed as an "unsigned int" and is thus converted to +(2^32-1): > # cat /etc/libvirt/storage/default.xml >  > > <pool type='dir'> > <name>default</name> > <uuid>4e2670b8-9dc3-528e-6fc2-58268e99f44f</uuid> > <capacity unit='bytes'>0</capacity> > <allocation unit='bytes'>0</allocation> > <available unit='bytes'>0</available> > <source> > </source> > <target> > <path>/var/lib/libvirt/images</path> > <permissions> > <mode>0700</mode> > <owner>4294967295</owner> > <group>4294967295</group> > </permissions> > </target> > </pool> When you next restart libvirtd virStorageDefParsePerms() tries to parse that as an "signed int", which fails in virXPathLongBase() because of > 182 if (*value != obj->floatval) { > (gdb) print *value > $11 = -2147483648 > (gdb) print obj->floatval > $12 = 4294967295 > (gdb) print /x *value > $13 = 0x80000000 > (gdb) print /x obj->floatval > $14 = 0xffffffff This then prints the following error messages: > 2012-11-23 14:03:18.877+0000: 25536: error : virStorageDefParsePerms:613 : > XML error: malformed owner element > 2012-11-23 14:03:19.581+0000: > 25529: error : storagePoolSetAutostart:1056 : Failed to create symlink > '/etc/libvirt/storage/autostart/default.xml' to '/etc/libvirt/storage/def The change to print owner and group as %d instead of %u was introdeces in commit 37a10129: > Update xml schemas according to libvirt source ... > storage_conf: Print uid_t and gid_t as signed to storage pool XML. Care to revert that change? Patch is attached. Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH be open. fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/ diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 7944555..b07a7aa 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1036,10 +1036,10 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) { virBufferAddLit(&buf," <permissions>\n"); virBufferAsprintf(&buf," <mode>0%o</mode>\n", def->target.perms.mode); - virBufferAsprintf(&buf," <owner>%d</owner>\n", - (int) def->target.perms.uid); - virBufferAsprintf(&buf," <group>%d</group>\n", - (int) def->target.perms.gid); + virBufferAsprintf(&buf," <owner>%u</owner>\n", + (unsigned int) def->target.perms.uid); + virBufferAsprintf(&buf," <group>%u</group>\n", + (unsigned int) def->target.perms.gid);

2 1

[libvirt] [PATCHv2] virsh: Report error when taking a snapshot with empty --memspec argument
by Peter Krempa 23 Nov '12

23 Nov '12

When the value of memspec was empty taking of a snapshot failed without reporting an error. --- tools/virsh-snapshot.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 398730c..8ec6456 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -358,18 +358,19 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) if (desc) virBufferEscapeString(&buf, " <description>%s</description>\n", desc); - if (vshCommandOptString(cmd, "memspec", &memspec) < 0 || - vshParseSnapshotMemspec(ctl, &buf, memspec) < 0) { - virBufferFreeAndReset(&buf); + if (vshCommandOptString(cmd, "memspec", &memspec) < 0) { + vshError(ctl, _("memspec argument must not be empty")); goto cleanup; } + + if (memspec && vshParseSnapshotMemspec(ctl, &buf, memspec) < 0) + goto cleanup; + if (vshCommandOptBool(cmd, "diskspec")) { virBufferAddLit(&buf, " <disks>\n"); while ((opt = vshCommandOptArgv(cmd, opt))) { - if (vshParseSnapshotDiskspec(ctl, &buf, opt->data) < 0) { - virBufferFreeAndReset(&buf); + if (vshParseSnapshotDiskspec(ctl, &buf, opt->data) < 0) goto cleanup; - } } virBufferAddLit(&buf, " </disks>\n"); } @@ -390,6 +391,7 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) ret = vshSnapshotCreate(ctl, dom, buffer, flags, NULL); cleanup: + virBufferFreeAndReset(&buf); VIR_FREE(buffer); if (dom) virDomainFree(dom); -- 1.8.0

2 2

Re: [libvirt] Remote connection to KVM hypervisor failed using libvirt 0.10.2
by Daniel P. Berrange 23 Nov '12

23 Nov '12

On Fri, Nov 23, 2012 at 11:13:58AM +0200, Ido Levy wrote: > > From: "Daniel P. Berrange" <berrange(a)redhat.com> > > To: Ido Levy/Haifa/IBM@IBMIL, > > Cc: libvir-list(a)redhat.com > > Date: 23/11/2012 10:59 AM > > Subject: Re: [libvirt] Remote connection to KVM hypervisor failed > > using libvirt 0.10.2 > > > > On Fri, Nov 23, 2012 at 07:43:12AM +0200, Ido Levy wrote: > > > Hello, > > > > > > I compiled libvirt 0.10.2 from source providing extra parameters to > the > > > configure procedure to support phyp and hyper-v driver support, and > python > > > binding. > > > When running virsh from the tools directory (libvirt-0.10.2/tools) and > > > > trying to connect to remote KVM hypervisor using connect > > > qemu+ssh://user@hostname/system > > > I got the following error > > > error: Failed to connect to the hypervisor > > > error: End of file while reading data: : Input/output error > > > > > > The same scenario working without any issue using virsh tool that is > > > shipped with RHEL distribution. > > > > > > Any advise how can I figure out how to resolve this. > > > > What are the full args you passed to 'configure' ? > > > > Daniel > > ./configure --with-python --with-phyp --with-hyperv Ok, that's the problem. If you want your build to be able to connect to the RPM based build, you need to make it use the same paths. For this you need to pass ./configure --with-python --with-phyp --with-hyperv \ --prefix=/usr --sysconfdir=/etc --localstatedir=/var Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 2

[libvirt] [PATCH 0/4] qemu: add boot order support for redirected and host USB devices
by Ján Tomko 23 Nov '12

23 Nov '12

Commit a4c19459aa8634c43b51e8138fb1d7eec4c17824 missed the functionality for redirected USB devices (fixed in 1/4), documentation and tests. https://bugzilla.redhat.com/show_bug.cgi?id=805414 Ján Tomko (4): conf: add support for booting from redirected USB devices docs: boot order for host and redirected USB devices tests: add boot order for host and redirected USB to qemu argv test tests: update qemuhelptest data docs/formatdomain.html.in | 27 ++- src/conf/domain_conf.c | 34 ++-- tests/qemuhelpdata/qemu-1.2.0 | 1 + tests/qemuhelpdata/qemu-1.2.0-device | 51 +++- tests/qemuhelpdata/qemu-kvm-1.2.0 | 276 ++++++++++++++++++++ tests/qemuhelpdata/qemu-kvm-1.2.0-device | 222 ++++++++++++++++ tests/qemuhelptest.c | 106 ++++++++- ...muxml2argv-hostdev-usb-address-device-boot.args | 6 + ...emuxml2argv-hostdev-usb-address-device-boot.xml | 28 ++ .../qemuxml2argv-usb-redir-boot.args | 10 + .../qemuxml2argv-usb-redir-boot.xml | 42 +++ tests/qemuxml2argvtest.c | 9 + 12 files changed, 775 insertions(+), 37 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-kvm-1.2.0 create mode 100644 tests/qemuhelpdata/qemu-kvm-1.2.0-device create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.xml -- 1.7.8.6

3 13

[libvirt] [PATCH] bitmap: fix typo to use UL type of integer constant in virBitmapIsAllSet
by Guannan Ren 23 Nov '12

23 Nov '12

This bug leads to get incorrect vcpupin information via qemudDomainGetVcpuPinInfo() API when the number of maximum cpu on a host falls into a scope such as 31 < ncpus < 64. gcc warning: left shift count >= width of type The following bug is such a case https://bugzilla.redhat.com/show_bug.cgi?id=876415 --- src/util/bitmap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/bitmap.c b/src/util/bitmap.c index 5ec5440..c29f5f3 100644 --- a/src/util/bitmap.c +++ b/src/util/bitmap.c @@ -574,8 +574,8 @@ bool virBitmapIsAllSet(virBitmapPtr bitmap) return false; if (unusedBits > 0) { - if ((bitmap->map[sz] & ((1U << (VIR_BITMAP_BITS_PER_UNIT - unusedBits)) - 1)) - != ((1U << (VIR_BITMAP_BITS_PER_UNIT - unusedBits)) - 1)) + if ((bitmap->map[sz] & ((1UL << (VIR_BITMAP_BITS_PER_UNIT - unusedBits)) - 1)) + != ((1UL << (VIR_BITMAP_BITS_PER_UNIT - unusedBits)) - 1)) return false; } -- 1.7.1

2 2

[libvirt] Remote connection to KVM hypervisor failed using libvirt 0.10.2
by Ido Levy 23 Nov '12

23 Nov '12

Hello, I compiled libvirt 0.10.2 from source providing extra parameters to the configure procedure to support phyp and hyper-v driver support, and python binding. When running virsh from the tools directory (libvirt-0.10.2/tools) and trying to connect to remote KVM hypervisor using connect qemu+ssh://user@hostname/system I got the following error error: Failed to connect to the hypervisor error: End of file while reading data: : Input/output error The same scenario working without any issue using virsh tool that is shipped with RHEL distribution. Any advise how can I figure out how to resolve this. Thanks, Ido

3 2

[libvirt] QMP Capability Detection Issues with GIT version of QEMU
by Viktor Mihajlovski 23 Nov '12

23 Nov '12

I ran into trouble today trying to use the GIT level of QEMU. In a nutshell: the capability detection with QMP is failing and the fallback using -help isn't working with the GIT level probably due to help text reformatting. The failure reason is that QEMU cannot bind to the QMP monitor socket in the /var/lib/libvirt/qemu directory. That's because the child process is stripped of all capabilities and this directory is chown'ed to qemu:qemu by the QEMU driver. Note that this is failing with the release QEMU as well, with the difference that the fallback is working there. I am willing to provide a patch, however I'd like to get feedback on the approach to use: 1. Add back Linux capabilities CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH to allow QEMU to bind to the monitor socket. This seems to be hacky/dodging the problem. 2. Use a separate directory for the QMP probing instance of QEMU. 3. Run the QMP QEMU under the configured qemu user. This would be my favorite. 4. Other ideas? -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski 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 3

[libvirt] [PATCH] Correct include-password option for domdisplay
by Martin Kletzander 23 Nov '12

23 Nov '12

The 'virsh domdisplay' command is able to display the password configured for spice, but it was missing for vnc type graphics. This is just a simple patch for that to work properly. --- tools/virsh-domain.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index cc47383..18aa869 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7073,6 +7073,23 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (STREQ(scheme[iter], "vnc")) { /* VNC protocol handlers take their port number as 'port' - 5900 */ port -= 5900; + + if (vshCommandOptBool(cmd, "include-password")) { + /* Create our XPATH lookup for the SPICE password */ + virAsprintf(&xpath, + "string(/domain/devices/graphics" + "[@type='%s']/@passwd)", + scheme[iter]); + if (!xpath) { + virReportOOMError(); + goto cleanup; + } + + /* Attempt to get the SPICE password */ + passwd = virXPathString(xpath, ctxt); + VIR_FREE(xpath); + } + } else if (STREQ(scheme[iter], "spice")) { /* Create our XPATH lookup for the SPICE TLS Port */ virAsprintf(&xpath, "string(/domain/devices/graphics[@type='%s']" -- 1.8.0

5 10

[libvirt] FYI: Upgrade from pc-0.12 / pc-014 vs. savevm section "kvmclock"
by Philipp Hahn 23 Nov '12

23 Nov '12

Hello, I'm using libvirt to manage my KVM instances. I created a VM with qemu-kvm-0.12, later upgraded to qemu-kvm-0.14 and took a snapshot using libvirt. As the original VM was created with qemu-kvm-0.12, libvirt stored "pc-0.12" with its XML data. Now I upgraded to qemu-kvm-1.1.2, where reverting to that snapshot fails with a the message > Unknown savevm section or instance 'kvmclock' 0 > load of migration failed I tracked that down to hw/pc_piix.c:590 where > static QEMUMachine pc_machine_v0_12 = { > .name = "pc-0.12", > .desc = "Standard PC", > .init = pc_init_pci_no_kvmclock, is defined. If I change .init to pc_init_pci, I'm able to load the old snapshot. I think this is because kvm-0.14 always created the kvmclock device, while that was only later changed (0ec329da) to be created "on demand" for pc-0.14s onward. So the snapshot is no longer a pure pc-0.12, but some pc-0.12+something, which qemu-kvm-1.1.2 refuses to load. Now that I know what the problem is I just want to inform others, who might experience the same problem. My workaround is a patched qemu-kvm, where I changed that .init mentioned above, since an additional enabled kvmclock does not seem to do any harm. If someone has a better fix, I'm open to suggestions. Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH be open. fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

1 0

[libvirt] [PATCH] node_device: Fix the improper logic when enumerating SRIOV VF
by Osier Yang 23 Nov '12

23 Nov '12

pciGetVirtualFunctions returns 0 even if there is no "virtfn" entry under the device sysfs path. And pciGetVirtualFunctions returns -1 when it tries to get the PCI config space of the VF, however, with keeping the the VFs already detected. That's why udevProcessPCI and gather_pci_cap use logic like: if (!pciGetVirtualFunctions(syspath, &data->pci_dev.virtual_functions, &data->pci_dev.num_virtual_functions) || data->pci_dev.num_virtual_functions > 0) data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; to tag the PCI device with "virtual_function" cap. This results in a VF will aslo get "virtual_function" cap. This patch fixes it by: * Ignoring the VF which has failure of getting PCI config space of the device (given that the succesfully detected VFs are kept , it makes sense to not give up on the failure of one VF too) with a warning, so pciGetVirtualFunctions will always return 0 except out of memory. * Free the allocated *virtual_functions when out of memory And thus the logic can be changed to: /* Out of memory */ if (pciGetVirtualFunctions(syspath, &data->pci_dev.virtual_functions, &data->pci_dev.num_virtual_functions) < 0) goto out; else if (!pciGetVirtualFunctions(syspath, &data->pci_dev.virtual_functions, &data->pci_dev.num_virtual_functions) && (data->pci_dev.num_virtual_functions > 0)) data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; This also fixes a memory leak in the old codes (it realloc the *virtual_functions first, and doesn't shrink it when it fails on getting the PCI config space). --- src/node_device/node_device_hal.c | 13 +++++++++-- src/node_device/node_device_udev.c | 11 +++++++-- src/util/pci.c | 37 +++++++++++++++++++++++------------ 3 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index ff73db0..69e6ebf 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -151,10 +151,17 @@ static int gather_pci_cap(LibHalContext *ctx, const char *udi, if (!pciGetPhysicalFunction(sysfs_path, &d->pci_dev.physical_function)) d->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION; - if (!pciGetVirtualFunctions(sysfs_path, &d->pci_dev.virtual_functions, - &d->pci_dev.num_virtual_functions) || - d->pci_dev.num_virtual_functions > 0) + if (!pciGetVirtualFunctions(sysfs_path, + &d->pci_dev.virtual_functions, + &d->pci_dev.num_virtual_functions) < 0) { + VIR_FREE(sysfs_path); + return -1; + } else if (!pciGetVirtualFunctions(sysfs_path, + &d->pci_dev.virtual_functions, + &d->pci_dev.num_virtual_functions) && + (d->pci_dev.num_virtual_functions > 0)) d->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; + } VIR_FREE(sysfs_path); } diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index acd78f2..72b8850 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -484,9 +484,14 @@ static int udevProcessPCI(struct udev_device *device, if (!pciGetPhysicalFunction(syspath, &data->pci_dev.physical_function)) data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION; - if (!pciGetVirtualFunctions(syspath, &data->pci_dev.virtual_functions, - &data->pci_dev.num_virtual_functions) || - data->pci_dev.num_virtual_functions > 0) + /* Out of memory */ + if (pciGetVirtualFunctions(syspath, &data->pci_dev.virtual_functions, + &data->pci_dev.num_virtual_functions) < 0) + goto out; + else if (!pciGetVirtualFunctions(syspath, + &data->pci_dev.virtual_functions, + &data->pci_dev.num_virtual_functions) && + (data->pci_dev.num_virtual_functions > 0)) data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; ret = 0; diff --git a/src/util/pci.c b/src/util/pci.c index d1ad121..3b4d96a 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -1930,6 +1930,7 @@ pciGetVirtualFunctions(const char *sysfs_path, unsigned int *num_virtual_functions) { int ret = -1; + int i; DIR *dir = NULL; struct dirent *entry = NULL; char *device_link = NULL; @@ -1952,6 +1953,7 @@ pciGetVirtualFunctions(const char *sysfs_path, *num_virtual_functions = 0; while ((entry = readdir(dir))) { if (STRPREFIX(entry->d_name, "virtfn")) { + struct pci_config_address *config_addr = NULL; if (virBuildPath(&device_link, sysfs_path, entry->d_name) == -1) { virReportOOMError(); @@ -1960,24 +1962,23 @@ pciGetVirtualFunctions(const char *sysfs_path, VIR_DEBUG("Number of virtual functions: %d", *num_virtual_functions); - if (VIR_REALLOC_N(*virtual_functions, - (*num_virtual_functions) + 1) != 0) { - virReportOOMError(); - VIR_FREE(device_link); - goto out; - } if (pciGetPciConfigAddressFromSysfsDeviceLink(device_link, - &((*virtual_functions)[*num_virtual_functions])) != + &config_addr) != SRIOV_FOUND) { - /* We should not get back SRIOV_NOT_FOUND in this - * case, so if we do, it's an error. */ - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to get SR IOV function from device " - "link '%s'"), device_link); + VIR_WARN("Failed to get SRIOV function from device " + "link '%s'", device_link); VIR_FREE(device_link); - goto out; + continue; } else { + if (VIR_ALLOC_N(*virtual_functions, + *num_virtual_functions + 1) < 0) { + virReportOOMError(); + VIR_FREE(config_addr); + goto out; + } + + (*virtual_functions)[*num_virtual_functions] = config_addr; (*num_virtual_functions)++; } VIR_FREE(device_link); @@ -1985,8 +1986,18 @@ pciGetVirtualFunctions(const char *sysfs_path, } ret = 0; + goto cleanup; out: + if (*virtual_functions) { + for (i = 0; i < *num_virtual_functions; i++) + VIR_FREE((*virtual_functions)[i]); + VIR_FREE(*virtual_functions); + } + +cleanup: + if (device_link) + VIR_FREE(device_link); if (dir) closedir(dir); -- 1.7.7.6

1 0

[libvirt] [PATCH 0/3] IPv6 enhancements plus dnsmasq conf-file
by Gene Czarcinski 23 Nov '12

23 Nov '12

The three patches are submitted with "one" because there is a dependency between them. That is, patch 2 (DHCPv6) assumes that patch 1 (guest-to-guest IPV6) has been applied and patch 3 (dnsmasq conf-file) assumes that patch 2 has been applied. While other files are also changed, most of the changes occur in src/network/bridge_driver.c and result in the conflicts. Yes, patch 1 was previously submitted as a stand-alone patch but it became obvious that it was not really standalone. This submittal is a "re-do" of my previous submittal which involved similar changes. Specifically, the order of the patches have been changed so that the conf-file changes are after the DHCPv6 changes. In addition, some code has been cleaned up. For example, there is no need to modify the radvd configuration since both DHCPv6 and dnsmasq's handling of RA are both keyed to dnsmasq version 2.64 or later. Gene Czarcinski (3): v1: allow guest to guest IPv6 without gateway definition v7.1 add support for DHCPv6 v7.2: put dnsmasq parameters into conf-file docs/formatnetwork.html.in | 126 +++++- src/conf/network_conf.c | 100 +++-- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 461 +++++++++++++++------ src/network/bridge_driver.h | 7 +- src/util/dnsmasq.c | 9 +- tests/networkxml2argvdata/dhcp6-network.argv | 17 + tests/networkxml2argvdata/dhcp6-network.xml | 16 + tests/networkxml2argvdata/isolated-network.argv | 25 +- tests/networkxml2argvdata/nat-network-dhcp6.argv | 20 + tests/networkxml2argvdata/nat-network-dhcp6.xml | 26 ++ .../networkxml2argvdata/nat-network-dns-hosts.argv | 15 +- .../nat-network-dns-srv-record-minimal.argv | 37 +- .../nat-network-dns-srv-record.argv | 37 +- .../nat-network-dns-txt-record.argv | 31 +- tests/networkxml2argvdata/nat-network.argv | 29 +- tests/networkxml2argvdata/netboot-network.argv | 29 +- .../networkxml2argvdata/netboot-proxy-network.argv | 26 +- .../routed-network-dhcphost.argv | 15 + .../routed-network-dhcphost.xml | 19 + tests/networkxml2argvdata/routed-network.argv | 13 +- tests/networkxml2argvtest.c | 46 +- 22 files changed, 790 insertions(+), 315 deletions(-) create mode 100644 tests/networkxml2argvdata/dhcp6-network.argv create mode 100644 tests/networkxml2argvdata/dhcp6-network.xml create mode 100644 tests/networkxml2argvdata/nat-network-dhcp6.argv create mode 100644 tests/networkxml2argvdata/nat-network-dhcp6.xml create mode 100644 tests/networkxml2argvdata/routed-network-dhcphost.argv create mode 100644 tests/networkxml2argvdata/routed-network-dhcphost.xml -- 1.7.11.7

1 5

[libvirt] [PATCHv2] qemu: Stop recursive detection of image chains when an image is missing
by Peter Krempa 22 Nov '12

22 Nov '12

Commit e0c469e58b93f852a72265919703cb6abd3779f8 that fixes the detection of image chain wasn't complete. Iteration through the backing image chain has to stop at the last existing image if some of the images are missing otherwise the backing chain that is cached contains entries with paths being set to NULL resulting to: error: Unable to allow access for disk path (null): Bad address Fortunately stat() is kind enough not to crash when it's presented with a NULL argument. At least on Linux. --- Left meta->backingStoreRaw in place to mark broken chains, added a comment and a warning. --- src/util/storage_file.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 2249212..4417404 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -728,8 +728,13 @@ virStorageFileGetMetadataFromBuf(int format, meta->backingStore = absolutePathFromBaseFile(path, backing); if (meta->backingStore == NULL) { /* the backing file is (currently) unavailable, treat this - * file as standalone */ + * file as standalone: + * backingStoreRaw is kept to mark broken image chains */ + meta->backingStoreIsFile = false; backingFormat = VIR_STORAGE_FILE_NONE; + VIR_WARN("Backing file '%s' of image '%s' is missing.", + meta->backingStoreRaw, path); + } } VIR_FREE(backing); -- 1.8.0

2 2

[libvirt] [PATCH] build: trivial fix error: implicit declaration of function 'malloc'
by Natanael Copa 22 Nov '12

22 Nov '12

Fixes this error when building with -Werror on Alpine Linux: util/processinfo.c: In function 'virProcessInfoSetAffinity': util/processinfo.c:52:5: error: implicit declaration of function 'malloc' [-Werror=implicit-function-declaration] Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> --- src/util/processinfo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/processinfo.c b/src/util/processinfo.c index c3648d4..b8c60eb 100644 --- a/src/util/processinfo.c +++ b/src/util/processinfo.c @@ -21,6 +21,7 @@ #include <config.h> +#include <stdlib.h> #include <sched.h> #include "processinfo.h" -- 1.8.0

3 5

[libvirt] RFC: Enable unprivileged SG_IO
by Osier Yang 22 Nov '12

22 Nov '12

Hi, http://lwn.net/Articles/524720/ introduces new sysfs knob (unpriv_sgio) for SCSI device to allow the unprivileged SG_IO. I don't have solid thought on how the libvirt interface should be yet. It shouldn't be a XML entry of disk device, as the device can be shared by multiple guests, and the configuration should be kept same for all of them, having a XML entry for it will make things a mess. What Paolo suggested is to add an entry in qemu.conf, just like "cgroup_device_acl": sgio_device_acl = [ "/dev/sda" ] When libvirtd starting, set the sysfs knob "unpriv_sgio" of the devices listed to 1, and 0 when libvirtd exists. I don't quite agree with this approach, as entries in qemu.conf generally should be configuration for the whole qemu driver, however, the SG_IO setting is at the device layer, or not higher than guest layer. What I'm thinking about is to have a public API to tune the knob independantly with domain/driver, that means it's up to management apps to manage the knob's value, setting it to 1 before domain(s) starting, and 0 when no domain is using it. Any thoughts? Regards, Osier

3 4

[libvirt] [PATCH v2] conf: Report sensible error for invalid disk name
by Martin Kletzander 22 Nov '12

22 Nov '12

The error "... but the cause is unknown" appeared for XMLs similar to this: <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/dev/zero'/> <target dev='sr0'/> </disk> Notice unsupported disk type (for the driver), but also no address specified. The first part is not a problem and we should not abort immediately because of that, but the combination with the address unknown was causing an unspecified error. While fixing this, I added an error to one place where this return value was not managed properly. --- v2: - Error moved from virDiskNameToIndex(a)util/util.c to virDomainDiskDefAssignAddress(a)conf/domain_conf.c - One more error added into qemuParseCommandLine(a)qemu/qemu_command.c src/conf/domain_conf.c | 6 +++++- src/qemu/qemu_command.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ed21f0f..3a1be02 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3063,8 +3063,12 @@ int virDomainDiskDefAssignAddress(virCapsPtr caps, virDomainDiskDefPtr def) { int idx = virDiskNameToIndex(def->dst); - if (idx < 0) + if (idx < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Unknown disk name '%s' and no address specified"), + def->dst); return -1; + } switch (def->bus) { case VIR_DOMAIN_DISK_BUS_SCSI: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 22bb209..097de9b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8342,8 +8342,12 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, !disk->dst) goto no_memory; - if (virDomainDiskDefAssignAddress(caps, disk) < 0) + if (virDomainDiskDefAssignAddress(caps, disk) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot assign address for device name '%s'"), + disk->dst); goto error; + } if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) goto no_memory; -- 1.8.0

2 2

[libvirt] [PATCH v3 UPDATED 0/2] Qemu/Gluster support in Libvirt
by Harsh Prateek Bora 22 Nov '12

22 Nov '12

Changelog: v3 updated: - Fix other network backends (nbd, rbd, sheepdog) to initialize new members (transport, socket) of _virDomainDiskHostDef appropriately so that garbage values doesnt break the argv2xml tests. v3: - RNG schema updated as required for unix transport [Paolo] - introduced another new attribute 'socket' for unix transport [Paolo] - Uses virURIFormat and virURIParse for URI parsing. [danpb] - updated documentation as required. [Jirka] v2: - Addressed review comments by Jiri - Updated patcheset as per new URI spec Ref: http://lists.gnu.org/archive/html/qemu-devel/2012-09/msg05199.html v1: - Initial prototype Harsh Prateek Bora (2): Qemu/Gluster: Add Gluster protocol as supported network disk formats. tests: Add tests for gluster protocol based network disks support docs/formatdomain.html.in | 24 ++- docs/schemas/domaincommon.rng | 35 ++++- src/conf/domain_conf.c | 72 +++++++-- src/conf/domain_conf.h | 12 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 168 ++++++++++++++++++++- tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-disk-drive-network-gluster.args | 1 + .../qemuxml2argv-disk-drive-network-gluster.xml | 35 +++++ tests/qemuxml2argvtest.c | 2 + 10 files changed, 323 insertions(+), 29 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml -- 1.7.11.7

6 10

[libvirt] [PATCH] qemu: Stop recursive detection of image chains when an image is missing
by Peter Krempa 22 Nov '12

22 Nov '12

Commit e0c469e58b93f852a72265919703cb6abd3779f8 that fixes the detection of image chain wasn't complete. Iteration through the backing image chain has to stop at the last existing image if some of the images are missing otherwise the backing chain that is cached contains entries with paths being set to NULL resulting to: error: Unable to allow access for disk path (null): Bad address Fortunately stat() is kind enough not to crash when it's presented with a NULL argument. --- src/util/storage_file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 2249212..e7cbea7 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -729,6 +729,8 @@ virStorageFileGetMetadataFromBuf(int format, if (meta->backingStore == NULL) { /* the backing file is (currently) unavailable, treat this * file as standalone */ + VIR_FREE(meta->backingStoreRaw); + meta->backingStoreIsFile = false; backingFormat = VIR_STORAGE_FILE_NONE; } } -- 1.8.0

2 5

[libvirt] [PATCH v2] Correct include-password option and rewrite domdisplay
by Martin Kletzander 22 Nov '12

22 Nov '12

The 'virsh domdisplay' command is able to display the password configured for spice, but it was missing for vnc type graphics. Also, there were some inconsistencies that are cleaned now. --- tools/virsh-domain.c | 74 +++++++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index cc47383..cc5c830 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7038,8 +7038,11 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) /* Attempt to grab our display info */ for (iter = 0; scheme[iter] != NULL; iter++) { /* Create our XPATH lookup for the current display's port */ - virAsprintf(&xpath, "string(/domain/devices/graphics[@type='%s']" - "/@port)", scheme[iter]); + virAsprintf(&xpath, + "string(/domain/devices/graphics[@type='%s']" + "/@port)", + scheme[iter]); + if (!xpath) { virReportOOMError(); goto cleanup; @@ -7056,8 +7059,10 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) continue; /* Create our XPATH lookup for the current display's address */ - virAsprintf(&xpath, "string(/domain/devices/graphics[@type='%s']" - "/@listen)", scheme[iter]); + virAsprintf(&xpath, + "string(/domain/devices/graphics[@type='%s']" + "/@listen)", + scheme[iter]); if (!xpath) { virReportOOMError(); goto cleanup; @@ -7069,14 +7074,36 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) listen_addr = virXPathString(xpath, ctxt); VIR_FREE(xpath); + /* We can query this info for all the graphics types since we'll + * get nothing for the unsupported ones (just rdp for now) */ + if (vshCommandOptBool(cmd, "include-password")) { + /* Create our XPATH lookup for the password */ + virAsprintf(&xpath, + "string(/domain/devices/graphics" + "[@type='%s']/@passwd)", + scheme[iter]); + + if (!xpath) { + virReportOOMError(); + goto cleanup; + } + + /* Attempt to get the password */ + passwd = virXPathString(xpath, ctxt); + VIR_FREE(xpath); + } + /* Per scheme data mangling */ if (STREQ(scheme[iter], "vnc")) { - /* VNC protocol handlers take their port number as 'port' - 5900 */ + /* VNC protocol handlers take their port number as + * 'port' - 5900 */ port -= 5900; } else if (STREQ(scheme[iter], "spice")) { /* Create our XPATH lookup for the SPICE TLS Port */ - virAsprintf(&xpath, "string(/domain/devices/graphics[@type='%s']" - "/@tlsPort)", scheme[iter]); + virAsprintf(&xpath, + "string(/domain/devices/graphics[@type='%s']" + "/@tlsPort)", + scheme[iter]); if (!xpath) { virReportOOMError(); goto cleanup; @@ -7087,25 +7114,17 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) VIR_FREE(xpath); if (tmp) tls_port = 0; - - if (vshCommandOptBool(cmd, "include-password")) { - /* Create our XPATH lookup for the SPICE password */ - virAsprintf(&xpath, "string(/domain/devices/graphics" - "[@type='%s']/@passwd)", scheme[iter]); - if (!xpath) { - virReportOOMError(); - goto cleanup; - } - - /* Attempt to get the SPICE password */ - passwd = virXPathString(xpath, ctxt); - VIR_FREE(xpath); - } } /* Build up the full URI, starting with the scheme */ virBufferAsprintf(&buf, "%s://", scheme[iter]); + /* There is no user, so just append password if there's any */ + if (passwd) { + virBufferAsprintf(&buf, ":%s@", passwd); + VIR_FREE(passwd); + } + /* Then host name or IP */ if (!listen_addr || STREQ((const char *)listen_addr, "0.0.0.0")) virBufferAddLit(&buf, "localhost"); @@ -7115,20 +7134,11 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) VIR_FREE(listen_addr); /* Add the port */ - if (STREQ(scheme[iter], "spice")) - virBufferAsprintf(&buf, "?port=%d", port); - else - virBufferAsprintf(&buf, ":%d", port); + virBufferAsprintf(&buf, ":%d", port); /* TLS Port */ if (tls_port) - virBufferAsprintf(&buf, "&tls-port=%d", tls_port); - - /* Password */ - if (passwd) { - virBufferAsprintf(&buf, "&password=%s", passwd); - VIR_FREE(passwd); - } + virBufferAsprintf(&buf, "?tls-port=%d", tls_port); /* Ensure we can print our URI */ if (virBufferError(&buf)) { -- 1.8.0

2 2

[libvirt] [PATCH] virsh: Report error when taking a snapshot with empty --memspec argument
by Peter Krempa 22 Nov '12

22 Nov '12

When the value of memspec was empty taking of a snapshot failed without reporting an error. --- This is only a quick fix. I think we should improve vshCommandOptStr to detect this for us and report an appropriate error, but this change will require a lot of changes not relevant to this problem. --- tools/virsh-snapshot.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 398730c..057ae2d 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -358,7 +358,12 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) if (desc) virBufferEscapeString(&buf, " <description>%s</description>\n", desc); - if (vshCommandOptString(cmd, "memspec", &memspec) < 0 || + if (vshCommandOptString(cmd, "memspec", &memspec) < 0) { + vshError(ctl, _("memspec argument must not be empty")); + goto cleanup; + } + + if (memspec && vshParseSnapshotMemspec(ctl, &buf, memspec) < 0) { virBufferFreeAndReset(&buf); goto cleanup; -- 1.8.0

2 2

[libvirt] [PATCH] Add device operations for lxc v1
by Heiher 22 Nov '12

22 Nov '12

Hello, Operations: 1. lxcDomainAttachDevice 2. lxcDomainAttachDeviceFlags 3. lxcDomainDetachDevice 4. lxcDomainDetachDeviceFlags 5. lxcDomainUpdateDeviceFlags In live mode, set devices.allow/deny to instance's cgroup and insert disk config into current domain. In config mode, just insert disk config into current domain. -- Best regards! Heiher https://heiher.info

2 1

[libvirt] [libvirt-glib v2] gobject: Also delete storage volume from its pool's list
by Zeeshan Ali (Khattak) 22 Nov '12

22 Nov '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Without this patch, storage pool still lists the volume even after it is deleted. Related Boxes bug: https://bugzilla.gnome.org/show_bug.cgi?id=688724 --- .../libvirt-gobject-storage-pool-private.h | 33 ++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-pool.c | 20 +++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.c | 3 ++ 3 files changed, 56 insertions(+) create mode 100644 libvirt-gobject/libvirt-gobject-storage-pool-private.h diff --git a/libvirt-gobject/libvirt-gobject-storage-pool-private.h b/libvirt-gobject/libvirt-gobject-storage-pool-private.h new file mode 100644 index 0000000..5492e5b --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-storage-pool-private.h @@ -0,0 +1,33 @@ +/* + * libvirt-gobject-storage-pool-private.h: libvirt gobject integration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + */ + +#ifndef __LIBVIRT_GOBJECT_STORAGE_POOL_PRIVATE_H__ +#define __LIBVIRT_GOBJECT_STORAGE_POOL_PRIVATE_H__ + +G_BEGIN_DECLS + +G_GNUC_INTERNAL void gvir_storage_pool_delete_vol(GVirStoragePool *pool, + GVirStorageVol *volume); + +G_END_DECLS + +#endif /* __LIBVIRT_GOBJECT_STORAGE_POOL_PRIVATE_H__ */ diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 8f579a1..107efa6 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -29,6 +29,7 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" +#include "libvirt-gobject-storage-pool-private.h" #define GVIR_STORAGE_POOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_STORAGE_POOL, GVirStoragePoolPrivate)) @@ -1129,3 +1130,22 @@ gboolean gvir_storage_pool_delete_finish(GVirStoragePool *pool, return TRUE; } + +G_GNUC_INTERNAL void gvir_storage_pool_delete_vol(GVirStoragePool *pool, + GVirStorageVol *volume) +{ + GVirStoragePoolPrivate *priv; + + g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); + g_return_if_fail(GVIR_IS_STORAGE_VOL(volume)); + + priv = pool->priv; + g_mutex_lock(priv->lock); + if (priv->volumes != NULL) { + const gchar *name = gvir_storage_vol_get_name(volume); + g_hash_table_remove(priv->volumes, name); + } else { + g_warn_if_reached(); + } + g_mutex_unlock(priv->lock); +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index c7ebb45..3a08450 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -29,6 +29,7 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" +#include "libvirt-gobject-storage-pool-private.h" #define GVIR_STORAGE_VOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_STORAGE_VOL, GVirStorageVolPrivate)) @@ -309,6 +310,8 @@ gboolean gvir_storage_vol_delete(GVirStorageVol *vol, g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + gvir_storage_pool_delete_vol(vol->priv->pool, vol); + if (virStorageVolDelete(vol->priv->handle, flags) < 0) { gvir_set_error_literal(err, GVIR_STORAGE_VOL_ERROR, -- 1.8.0

2 1