|
 |
0a7476 |
From 9a0d6a2eac4a69d548620f80ed0c71fc0cb6d415 Mon Sep 17 00:00:00 2001
|
|
|
0a7476 |
Message-Id: <9a0d6a2eac4a69d548620f80ed0c71fc0cb6d415@dist-git>
|
|
|
0a7476 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
0a7476 |
Date: Thu, 11 Apr 2019 15:14:16 -0400
|
|
|
0a7476 |
Subject: [PATCH] qemu: Use @tmpChr in qemuDomainDetachChrDevice to build
|
|
|
0a7476 |
device string
|
|
|
0a7476 |
|
|
|
0a7476 |
So far we are passing @chr to qemuBuildChrDeviceStr. This is
|
|
|
0a7476 |
suboptimal (in fact wrong) because @chr is just parsed XML
|
|
|
0a7476 |
definition provided by user which by definition may lack some
|
|
|
0a7476 |
information. On the other hand, @tmpChr is the one that was found
|
|
|
0a7476 |
using @chr in domain definition so it contains the same amount of
|
|
|
0a7476 |
information or more.
|
|
|
0a7476 |
|
|
|
0a7476 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
0a7476 |
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
|
|
0a7476 |
(cherry picked from commit f538f5ed3a876c3cb67ae5b7a01f133f192aca13)
|
|
|
0a7476 |
|
|
|
0a7476 |
Partially-Resolves: https://bugzilla.redhat.com/1658198
|
|
|
0a7476 |
Signed-off-by: Laine Stump <laine@redhat.com>
|
|
|
0a7476 |
Signed-off-by: Laine Stump <laine@laine.org>
|
|
|
0a7476 |
Message-Id: <20190411191453.24055-5-laine@redhat.com>
|
|
|
0a7476 |
Acked-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
0a7476 |
---
|
|
|
0a7476 |
src/qemu/qemu_hotplug.c | 2 +-
|
|
|
0a7476 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
0a7476 |
|
|
|
0a7476 |
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
|
|
0a7476 |
index 5e11e1997a..46cafef4c2 100644
|
|
|
0a7476 |
--- a/src/qemu/qemu_hotplug.c
|
|
|
0a7476 |
+++ b/src/qemu/qemu_hotplug.c
|
|
|
0a7476 |
@@ -5594,7 +5594,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
|
|
|
0a7476 |
|
|
|
0a7476 |
sa_assert(tmpChr->info.alias);
|
|
|
0a7476 |
|
|
|
0a7476 |
- if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0)
|
|
|
0a7476 |
+ if (qemuBuildChrDeviceStr(&devstr, vmdef, tmpChr, priv->qemuCaps) < 0)
|
|
|
0a7476 |
goto cleanup;
|
|
|
0a7476 |
|
|
|
0a7476 |
if (!async)
|
|
|
0a7476 |
--
|
|
|
0a7476 |
2.21.0
|
|
|
0a7476 |
|