- Devel - libvirt List Archives

[libvirt] [PATCH v3] Ignore virtio-mmio disks in qemuAssignDevicePCISlots()
by Pavel Fedin 15 Sep '15

15 Sep '15

Fixes the following error when attempting to add a disk with bus='virtio' to a machine which actually supports virtio-mmio (caught with ARM virt): virtio disk cannot have an address of type 'virtio-mmio' The problem has been likely introduced by e8d55172544c1fafe31a9e09346bdebca4f0d6f9. Before that qemuAssignDevicePCISlots() was never called for ARM "virt" machine. Signed-off-by: Pavel Fedin <p.fedin(a)samsung.com> --- v2 => v3 - Bring back qemuCaps to qemuAssignDevicePCISlots(), was lost in a3ecd63e928ff39d73c1c14b0fb3be8addbc977b - Swap conditions so as not to call virQEMUCapsGet() every time v1 => v2 - Added check for QEMU_CAPS_DEVICE_VIRTIO_MMIO, this leaves the error message for machines which actually do not support virtio-mmio. In this case the user may still attempt to add such a disk manually. --- src/qemu/qemu_command.c | 11 +++++++++-- src/qemu/qemu_command.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ec5e3d4..ea1bb28 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2241,7 +2241,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, virDomainPCIAddressReserveNextSlot(addrs, &info, flags) < 0) goto cleanup; - if (qemuAssignDevicePCISlots(def, addrs) < 0) + if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0) goto cleanup; for (i = 1; i < addrs->nbuses; i++) { @@ -2274,7 +2274,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, if (qemuValidateDevicePCISlotsChipsets(def, qemuCaps, addrs) < 0) goto cleanup; - if (qemuAssignDevicePCISlots(def, addrs) < 0) + if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0) goto cleanup; for (i = 0; i < def->ncontrollers; i++) { @@ -2406,6 +2406,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, */ int qemuAssignDevicePCISlots(virDomainDefPtr def, + virQEMUCapsPtr qemuCaps, virDomainPCIAddressSetPtr addrs) { size_t i, j; @@ -2598,6 +2599,12 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) continue; + /* Also ignore virtio-mmio disks if our machine allows them */ + if (def->disks[i]->info.type == + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) + continue; + if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("virtio disk cannot have an address of type '%s'"), diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 767d31f..4aa7f2d 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -284,6 +284,7 @@ virDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def, bool dryRun); int qemuAssignDevicePCISlots(virDomainDefPtr def, + virQEMUCapsPtr qemuCaps, virDomainPCIAddressSetPtr addrs); int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps); -- 1.9.5.msysgit.0

2 1

[libvirt] [PATCH] Minor typo fixes in documentation
by Christian Loehle 15 Sep '15

15 Sep '15

Signed-off-by: Christian Loehle <cloehle(a)linutronix.de>

2 1

[libvirt] [PATCH 0/3] Implement mockup capabilities cache in QEMU tests
by Pavel Fedin 15 Sep '15

15 Sep '15

Since commit e8d55172544c1fafe31a9e09346bdebca4f0d6f9 qemu driver checks emulator capabilities during domain XML post-parse. However, test suite does not initialize it, therefore a condition to skip all checks if there is no cache supplied was added. This is actually a hack, whose sole purpose is to make existing test suite working. Additionally, it prevents from writing new tests for this particular functionality. This series solves this problem by implementing proper cache mockup in test suite. The main idea is to create a cache in standard way and put there pre-defined capabilities sets (which tests already have). In this implementation we introduce "test capability sets", which are named entities. virQEMUCapsCacheLookup() now has a test mode, which is enabled by setting qemuTestCapsName variable to the name of capability set which we want to use in current test. This is based on Martin Kletzander's idea to implement test mode with assertions. Currently, since name of capability set is different from /usr/bin/something, we will get errors if we try to do something with the host filesystem. This is achieved by setting cacheDir and libDir of our mockup cache to "/dev/null". The concept of using named capability sets allows us to further improve the test suite. Now it is possibe to get rid of hardcoded capability sets and replace them with XML files, readable by virQEMUCapsInitCached(). This will allow us to better exercise our capabilities parser. Taking this into account, qemuTestCapsCacheInsert() is actually temporary. It will not be needed any more when capabilities are moved to XML files. Additionally, some small refactoring is done, and common driver initialization and cleanup sequence is put into two functions: qemuTestDriverInit() and qemuTestDriverFree(). I don't include changelist because this is a major rework of the RFC, almost everything has been changed. Pavel Fedin (3): Implement infrastracture for mocking up QEMU capabilities cache Use mockup cache Removed unneeded check src/qemu/qemu_capabilities.c | 16 +++++------- src/qemu/qemu_capspriv.h | 36 +++++++++++++++++++++++++ src/qemu/qemu_domain.c | 5 +--- tests/qemuagenttest.c | 18 +++++++++---- tests/qemuargv2xmltest.c | 19 +++++++------- tests/qemuhotplugtest.c | 32 ++++++++++++----------- tests/qemuxml2argvtest.c | 17 ++++++------ tests/qemuxml2xmltest.c | 16 ++++++++---- tests/qemuxmlnstest.c | 17 ++++++------ tests/testutilsqemu.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ tests/testutilsqemu.h | 9 +++++++ 11 files changed, 182 insertions(+), 65 deletions(-) mode change 100644 => 100755 src/qemu/qemu_capabilities.c create mode 100644 src/qemu/qemu_capspriv.h mode change 100644 => 100755 tests/qemuagenttest.c mode change 100644 => 100755 tests/qemuargv2xmltest.c mode change 100644 => 100755 tests/qemuhotplugtest.c mode change 100644 => 100755 tests/qemuxml2argvtest.c mode change 100644 => 100755 tests/qemuxml2xmltest.c mode change 100644 => 100755 tests/qemuxmlnstest.c mode change 100644 => 100755 tests/testutilsqemu.c mode change 100644 => 100755 tests/testutilsqemu.h -- 2.1.4

2 7

[libvirt] [PATCH] conf/qemu: enforce NUMA nodes only for x86 memory hotplug
by Nikunj A Dadhania 15 Sep '15

15 Sep '15

libvirt enforces at least one NUMA node for memory hotplug support on all architectures. While it might be required for some x86 guest, PowerPC can hotplug memory on non-NUMA system. The generic checks are replaced with arch specific check and xml validation too does not enforce "node" for non-x86 arch. CC: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Nikunj A Dadhania <nikunj(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 9 ++++++--- src/qemu/qemu_command.c | 28 +++++++++++++++++----------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fd0450f..4cb2d4a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12430,6 +12430,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, static int virDomainMemoryTargetDefParseXML(xmlNodePtr node, + const virDomainDef *domDef, xmlXPathContextPtr ctxt, virDomainMemoryDefPtr def) { @@ -12437,7 +12438,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, xmlNodePtr save = ctxt->node; ctxt->node = node; - if (virXPathUInt("string(./node)", ctxt, &def->targetNode) < 0) { + if (virXPathUInt("string(./node)", ctxt, &def->targetNode) < 0 && ARCH_IS_X86(domDef->os.arch)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid or missing value of memory device node")); goto cleanup; @@ -12457,6 +12458,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, static virDomainMemoryDefPtr virDomainMemoryDefParseXML(xmlNodePtr memdevNode, + const virDomainDef *domDef, xmlXPathContextPtr ctxt, unsigned int flags) { @@ -12495,7 +12497,7 @@ virDomainMemoryDefParseXML(xmlNodePtr memdevNode, goto error; } - if (virDomainMemoryTargetDefParseXML(node, ctxt, def) < 0) + if (virDomainMemoryTargetDefParseXML(node, domDef, ctxt, def) < 0) goto error; if (virDomainDeviceInfoParseXML(memdevNode, NULL, &def->info, flags) < 0) @@ -12647,7 +12649,7 @@ virDomainDeviceDefParse(const char *xmlStr, goto error; break; case VIR_DOMAIN_DEVICE_MEMORY: - if (!(dev->data.memory = virDomainMemoryDefParseXML(node, ctxt, flags))) + if (!(dev->data.memory = virDomainMemoryDefParseXML(node, def, ctxt, flags))) goto error; break; case VIR_DOMAIN_DEVICE_NONE: @@ -16328,6 +16330,7 @@ virDomainDefParseXML(xmlDocPtr xml, for (i = 0; i < n; i++) { virDomainMemoryDefPtr mem = virDomainMemoryDefParseXML(nodes[i], + def, ctxt, flags); if (!mem) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ae03618..51160e7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4979,8 +4979,12 @@ qemuBuildMemoryBackendStr(unsigned long long size, *backendProps = NULL; *backendType = NULL; - /* memory devices could provide a invalid guest node */ - if (guestNode >= virDomainNumaGetNodeCount(def->numa)) { + /* memory devices could provide a invalid guest node. Moreover, + * x86 guests needs at least one numa node to support memory + * hotplug + */ + if ((virDomainNumaGetNodeCount(def->numa) == 0 && ARCH_IS_X86(def->os.arch)) || + guestNode > virDomainNumaGetNodeCount(def->numa)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("can't add memory backend for guest node '%d' as " "the guest has only '%zu' NUMA nodes configured"), @@ -4991,10 +4995,12 @@ qemuBuildMemoryBackendStr(unsigned long long size, if (!(props = virJSONValueNewObject())) return -1; - memAccess = virDomainNumaGetNodeMemoryAccessMode(def->numa, guestNode); - if (virDomainNumatuneGetMode(def->numa, guestNode, &mode) < 0 && - virDomainNumatuneGetMode(def->numa, -1, &mode) < 0) - mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + if (virDomainNumaGetNodeCount(def->numa)) { + memAccess = virDomainNumaGetNodeMemoryAccessMode(def->numa, guestNode); + if (virDomainNumatuneGetMode(def->numa, guestNode, &mode) < 0 && + virDomainNumatuneGetMode(def->numa, -1, &mode) < 0) + mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + } if (pagesize == 0) { /* Find the huge page size we want to use */ @@ -9238,11 +9244,11 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; } - /* due to guest support, qemu would silently enable NUMA with one node - * once the memory hotplug backend is enabled. To avoid possible - * confusion we will enforce user originated numa configuration along - * with memory hotplug. */ - if (virDomainNumaGetNodeCount(def->numa) == 0) { + /* x86 windows guest needs at least one numa node to be + * present. While its not possible to detect what guest os is + * running, enforce this limitation only to x86 architecture. + */ + if (ARCH_IS_X86(def->os.arch) && virDomainNumaGetNodeCount(def->numa) == 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("At least one numa node has to be configured when " "enabling memory hotplug")); -- 2.4.3

3 5

[libvirt] [PATCH] rbd: Remove snapshots if the FORCED flag has been provided
by Wido den Hollander 14 Sep '15

14 Sep '15

When a RBD volume has snapshots it can not be removed. This patch introduces a new flag to force volume removal, VIR_STORAGE_VOL_DELETE_FORCED. With this flag any existing snapshots will be removed prior to removing the volume. No existing mechanism in libvirt allowed us to pass such information, so that's why a new flag was introduced. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- include/libvirt/libvirt-storage.h | 1 + src/storage/storage_backend_rbd.c | 58 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 453089e..36ff979 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -115,6 +115,7 @@ typedef enum { typedef enum { VIR_STORAGE_VOL_DELETE_NORMAL = 0, /* Delete metadata only (fast) */ VIR_STORAGE_VOL_DELETE_ZEROED = 1 << 0, /* Clear all data to zeros (slow) */ + VIR_STORAGE_VOL_DELETE_FORCED = 2, /* Force removal of volume, even if in use */ } virStorageVolDeleteFlags; typedef enum { diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index ac5085a..ca5e802 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -428,9 +428,13 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, { int ret = -1; int r = 0; + int max_snaps = 128; + int i, snap_count, protected; virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; + rbd_snap_info_t *snaps; + rbd_image_t image = NULL; VIR_DEBUG("Removing RBD image %s/%s", pool->def->source.name, vol->name); @@ -443,6 +447,59 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) goto cleanup; + r = rbd_open(ptr.ioctx, vol->name, &image, NULL); + if (r < 0) { + virReportSystemError(-r, _("failed to open the RBD image '%s'"), + vol->name); + goto cleanup; + } + + do { + if (VIR_ALLOC_N(snaps, max_snaps)) + goto cleanup; + + snap_count = rbd_snap_list(image, snaps, &max_snaps); + if (snap_count <= 0) { + VIR_FREE(snaps); + } + } while (snap_count == -ERANGE); + + VIR_DEBUG("Found %d snapshots for volume %s/%s", snap_count, + pool->def->source.name, vol->name); + + if (snap_count > 0 && (flags & VIR_STORAGE_VOL_DELETE_FORCED)) { + for (i = 0; i < snap_count; i++) { + if (rbd_snap_is_protected(image, snaps[i].name, &protected)) + goto cleanup; + + if (protected == 1) { + VIR_DEBUG("Snapshot %s/%s@%s is protected needs to be " + "unprotected", pool->def->source.name, vol->name, + snaps[i].name); + + if (rbd_snap_unprotect(image, snaps[i].name) < 0) + goto cleanup; + } + + VIR_DEBUG("Removing snapshot %s/%s@%s", pool->def->source.name, + vol->name, snaps[i].name); + + if (rbd_snap_remove(image, snaps[i].name) < 0) { + virReportSystemError(-r, _("failed to remove snapshot '%s/%s@%s'"), + pool->def->source.name, vol->name, + snaps[i].name); + goto cleanup; + } + } + + rbd_snap_list_end(snaps); + } + + if (rbd_close(image) < 0) + goto cleanup; + + VIR_DEBUG("Removing volume %s/%s", pool->def->source.name, vol->name); + r = rbd_remove(ptr.ioctx, vol->name); if (r < 0 && (-r) != ENOENT) { virReportSystemError(-r, _("failed to remove volume '%s/%s'"), @@ -453,6 +510,7 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, ret = 0; cleanup: + VIR_FREE(snaps); virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } -- 1.9.1

1 0

[libvirt] [PATCH] qemuDomainUpdateDeviceConfig: Allow startupPolicy update, yet again
by Michal Privoznik 14 Sep '15

14 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1159219 So, in 11e058ca589808bd I've tried to make UpdateDevice update startupPolicy too. And it worked well until somebody came around and pushed d0dc6c036914da which accidentally removed my contribution. Redo my commit. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 91eb661..03ef972 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8353,6 +8353,7 @@ qemuDomainUpdateDeviceConfig(virQEMUCapsPtr qemuCaps, * We allow updating src/type//driverType/cachemode/ */ orig->cachemode = disk->cachemode; + orig->startupPolicy = disk->startupPolicy; virStorageSourceFree(orig->src); orig->src = disk->src; -- 2.4.6

2 3

[libvirt] [PATCH] util: Add space before comment end marker
by Andrea Bolognani 14 Sep '15

14 Sep '15

This allows the Wikipedia link to be recognized correctly by eg. gnome-terminal's Open Link and Copy Link Address features. --- Pushed as trivial src/util/virarch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virarch.h b/src/util/virarch.h index 3206ce2..af5ff83 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -45,7 +45,7 @@ typedef enum { VIR_ARCH_MIPS64, /* MIPS 64 BE http://en.wikipedia.org/wiki/MIPS_architecture */ VIR_ARCH_MIPS64EL, /* MIPS 64 LE http://en.wikipedia.org/wiki/MIPS_architecture */ - VIR_ARCH_OR32, /* OpenRisc 32 BE http://en.wikipedia.org/wiki/OpenRISC#QEMU_support*/ + VIR_ARCH_OR32, /* OpenRisc 32 BE http://en.wikipedia.org/wiki/OpenRISC#QEMU_support */ VIR_ARCH_PARISC, /* PA-Risc 32 BE http://en.wikipedia.org/wiki/PA-RISC */ VIR_ARCH_PARISC64, /* PA-Risc 64 BE http://en.wikipedia.org/wiki/PA-RISC */ -- 2.4.3

1 0

[libvirt] [PATCH] virsh: Fix job status indicator for 0 length block jobs
by Peter Krempa 14 Sep '15

14 Sep '15

Although 0 length block jobs aren't entirely useful, the output of virsh blockjob is empty due to the condition that suppresses the output for migration jobs that did not start. Add a flag for virshPrintJobProgress that specifies that the job was started so that the function can be used both in migration where the job starts delayed and for block jobs where we already know that the job was started. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1196711 --- tools/virsh-domain.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b029b65..7837974 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1683,13 +1683,23 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) } +/** + * virshPrintJobProgress: + * @label: name of the block job + * @remaining: amount of remaining work + * @total: amount of total work + * @started: The block job was started already + * + * Prints a human friendly percentage string decribing the state of the given + * job. The output is omitted if the job was not started. + */ static void virshPrintJobProgress(const char *label, unsigned long long remaining, - unsigned long long total) + unsigned long long total, bool started) { int progress; - if (total == 0) + if (total == 0 && !started) /* migration has not been started */ return; @@ -1921,7 +1931,7 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) if (data->verbose) virshPrintJobProgress(data->job_name, info.end - info.cur, - info.end); + info.end, true); if (data->timeout && virTimeMillisNow(&curr) < 0) { vshSaveLibvirtError(); @@ -1949,7 +1959,7 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) if (data->verbose && (ret == VIR_DOMAIN_BLOCK_JOB_COMPLETED || ret == VIR_DOMAIN_BLOCK_JOB_READY)) - virshPrintJobProgress(data->job_name, 0, 1); + virshPrintJobProgress(data->job_name, 0, 1, true); sigaction(SIGINT, &old_sig_action, NULL); return ret; @@ -2621,7 +2631,7 @@ virshBlockJobInfo(vshControl *ctl, info.bandwidth, info.cur, info.end); } else { virshPrintJobProgress(virshDomainBlockJobToString(info.type), - info.end - info.cur, info.end); + info.end - info.cur, info.end, true); if (speed) { const char *unit; double val = vshPrettyCapacity(speed, &unit); @@ -4356,7 +4366,7 @@ virshWatchJob(vshControl *ctl, retchar == '0') { if (verbose) { /* print [100 %] */ - virshPrintJobProgress(label, 0, 1); + virshPrintJobProgress(label, 0, 1, true); } break; } @@ -4392,7 +4402,7 @@ virshWatchJob(vshControl *ctl, if (ret == 0) { if (verbose) virshPrintJobProgress(label, jobinfo.dataRemaining, - jobinfo.dataTotal); + jobinfo.dataTotal, false); if (!jobStarted && (jobinfo.type == VIR_DOMAIN_JOB_BOUNDED || -- 2.4.5

2 1

[libvirt] [PATCH 0/2] Fix permissions for per-VM and qemu directories
by Martin Kletzander 14 Sep '15

14 Sep '15

This is basically v2 of: https://www.redhat.com/archives/libvir-list/2015-September/msg00295.html with some changes: - permissions for per-VM dirs are fixed as well - permissions for the /var/lib/libvirt/qemu directory are fixed in the install phase of Makefile.am in addition to the spec file We could also fix the permissions in qemuStateInitialize, but I chose to do it this way. Bear in mind, that both approaches have their pros and cons, of course. Martin Kletzander (2): qemu: Do not allow others into per-VM subdirectories qemu: Allow others to browse /var/lib/libvirt/qemu libvirt.spec.in | 4 ++-- src/Makefile.am | 2 +- src/qemu/qemu_process.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.5.2

2 3

[libvirt] [PATCH] qemu: hotplug: Properly clean up drive backend if frontend hotplug fails
by Peter Krempa 14 Sep '15

14 Sep '15

Commit 8125113c added code that should remove the disk backend if the fronted hotplug failed for any reason. The code had a bug though as it used the disk string for unplug rather than the backend alias. Fix the code by pre-creating an alias string and using it instead of the disk string. In cases where qemu does not support QEMU_CAPS_DEVICE, we ignore the unplug of the backend since we can't really create an alias in that case. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1262399 --- src/qemu/qemu_hotplug.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 63fafa6..c956e8c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -321,6 +321,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, qemuDomainObjPrivatePtr priv = vm->privateData; char *devstr = NULL; char *drivestr = NULL; + char *drivealias = NULL; bool releaseaddr = false; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); const char *src = virDomainDiskGetSource(disk); @@ -365,6 +366,10 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps))) goto error; + if (virAsprintf(&drivealias, "%s%s", QEMU_DRIVE_HOST_PREFIX, + disk->info.alias) < 0) + goto error; + if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps))) goto error; } @@ -379,7 +384,8 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, ret = qemuMonitorAddDevice(priv->mon, devstr); if (ret < 0) { virErrorPtr orig_err = virSaveLastError(); - if (qemuMonitorDriveDel(priv->mon, drivestr) < 0) { + if (!drivealias || + qemuMonitorDriveDel(priv->mon, drivealias) < 0) { VIR_WARN("Unable to remove drive %s (%s) after failed " "qemuMonitorAddDevice", drivestr, devstr); @@ -415,6 +421,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, cleanup: VIR_FREE(devstr); VIR_FREE(drivestr); + VIR_FREE(drivealias); virObjectUnref(cfg); return ret; -- 2.4.5

2 2