From: John Ferlan <jferlan@redhat.com>
Date: Wed, 8 Oct 2014 22:52:26 +0000 (-0400)
Subject: qemu-attach: Assign device aliases
X-Git-Tag: v1.2.10-rc1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a52afcfcc3478b553dca38140394fd93f90a2c;p=thirdparty%2Flibvirt.git

qemu-attach: Assign device aliases

https://bugzilla.redhat.com/show_bug.cgi?id=1141621

As part of attach processing, assign the device aliases by calling
qemuAssignDeviceAliases during qemuDomainQemuAttach once all the devices
are found after the qemuParseCommandLinePid processing.

This will alleviate a symptom that caused a libvirtd crash during an
attempted device detach.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3ba5661741..373daab776 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15083,6 +15083,9 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn,
     if (qemuCanonicalizeMachine(def, qemuCaps) < 0)
         goto cleanup;
 
+    if (qemuAssignDeviceAliases(def, qemuCaps) < 0)
+        goto cleanup;
+
     if (qemuDomainAssignAddresses(def, qemuCaps, NULL) < 0)
         goto cleanup;