forked from rpms/libvirt
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
From cdb5af98d3801255903c4237269ca5723abc36c1 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <cdb5af98d3801255903c4237269ca5723abc36c1@dist-git>
|
||
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Date: Thu, 27 Jun 2019 14:44:44 +0200
|
||
|
|
Subject: [PATCH] qemu: Use @tmpChr in qemuDomainDetachChrDevice to build
|
||
|
|
device string
|
||
|
|
|
||
|
|
So far we are passing @chr to qemuBuildChrDeviceStr. This is
|
||
|
|
suboptimal (in fact wrong) because @chr is just parsed XML
|
||
|
|
definition provided by user which by definition may lack some
|
||
|
|
information. On the other hand, @tmpChr is the one that was found
|
||
|
|
using @chr in domain definition so it contains the same amount of
|
||
|
|
information or more.
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
||
|
|
(cherry picked from commit f538f5ed3a876c3cb67ae5b7a01f133f192aca13)
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1624204
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Message-Id: <75600f93c5e22f43762635ac97f5a0acef1cf465.1561639408.git.mprivozn@redhat.com>
|
||
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_hotplug.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
||
|
|
index 5b9a5683bb..da9d56ffb1 100644
|
||
|
|
--- a/src/qemu/qemu_hotplug.c
|
||
|
|
+++ b/src/qemu/qemu_hotplug.c
|
||
|
|
@@ -5753,7 +5753,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
|
||
|
|
|
||
|
|
sa_assert(tmpChr->info.alias);
|
||
|
|
|
||
|
|
- if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0)
|
||
|
|
+ if (qemuBuildChrDeviceStr(&devstr, vmdef, tmpChr, priv->qemuCaps) < 0)
|
||
|
|
goto cleanup;
|
||
|
|
|
||
|
|
if (!async)
|
||
|
|
--
|
||
|
|
2.22.0
|
||
|
|
|