- 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 27 Nov '12

27 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 27 Nov '12

27 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