|
 |
9119d9 |
From b25d3689c715af6f7d39194d273fb5ebcb0dccc2 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <b25d3689c715af6f7d39194d273fb5ebcb0dccc2@dist-git>
|
|
|
9119d9 |
From: John Ferlan <jferlan@redhat.com>
|
|
|
9119d9 |
Date: Tue, 28 Oct 2014 22:28:49 -0400
|
|
|
9119d9 |
Subject: [PATCH] qemu-attach: Assign device aliases
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1141621
|
|
|
9119d9 |
|
|
|
9119d9 |
As part of attach processing, assign the device aliases by calling
|
|
|
9119d9 |
qemuAssignDeviceAliases during qemuDomainQemuAttach once all the devices
|
|
|
9119d9 |
are found after the qemuParseCommandLinePid processing.
|
|
|
9119d9 |
|
|
|
9119d9 |
This will alleviate a symptom that caused a libvirtd crash during an
|
|
|
9119d9 |
attempted device detach.
|
|
|
9119d9 |
|
|
|
9119d9 |
(cherry picked from commit e3a52afcfcc3478b553dca38140394fd93f90a2c)
|
|
|
9119d9 |
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
src/qemu/qemu_driver.c | 3 +++
|
|
|
9119d9 |
1 file changed, 3 insertions(+)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
9119d9 |
index 88a1895..c158f64 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_driver.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_driver.c
|
|
|
9119d9 |
@@ -14793,6 +14793,9 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn,
|
|
|
9119d9 |
if (qemuCanonicalizeMachine(def, qemuCaps) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
|
|
|
9119d9 |
+ if (qemuAssignDeviceAliases(def, qemuCaps) < 0)
|
|
|
9119d9 |
+ goto cleanup;
|
|
|
9119d9 |
+
|
|
|
9119d9 |
if (qemuDomainAssignAddresses(def, qemuCaps, NULL) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.3
|
|
|
9119d9 |
|