|
 |
6ae9ed |
From a67d5e7badd536eae52b575a02e9e146e42b26a2 Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <a67d5e7badd536eae52b575a02e9e146e42b26a2@dist-git>
|
|
|
6ae9ed |
From: John Ferlan <jferlan@redhat.com>
|
|
|
6ae9ed |
Date: Mon, 25 Jul 2016 12:43:01 -0400
|
|
|
6ae9ed |
Subject: [PATCH] qemu: Move setting of obj bools for
|
|
|
6ae9ed |
qemuDomainAttachVirtioDiskDevice
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1301021
|
|
|
6ae9ed |
|
|
|
6ae9ed |
A post push realization that the setting of the boolean needed to be
|
|
|
6ae9ed |
inside the if condition.
|
|
|
6ae9ed |
|
|
|
6ae9ed |
(cherry picked from commit c144f14c120a3b4fd3b7cf87bf0bbc30183464a0)
|
|
|
6ae9ed |
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/qemu/qemu_hotplug.c | 4 ++--
|
|
|
6ae9ed |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
|
|
6ae9ed |
index 6509867..1fa1010 100644
|
|
|
6ae9ed |
--- a/src/qemu/qemu_hotplug.c
|
|
|
6ae9ed |
+++ b/src/qemu/qemu_hotplug.c
|
|
|
6ae9ed |
@@ -383,8 +383,8 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
|
|
|
6ae9ed |
secobjProps = NULL; /* qemuMonitorAddObject consumes */
|
|
|
6ae9ed |
if (rv < 0)
|
|
|
6ae9ed |
goto exit_monitor;
|
|
|
6ae9ed |
+ secobjAdded = true;
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
- secobjAdded = true;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
if (encobjProps) {
|
|
|
6ae9ed |
rv = qemuMonitorAddObject(priv->mon, "secret", encinfo->s.aes.alias,
|
|
|
6ae9ed |
@@ -392,8 +392,8 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
|
|
|
6ae9ed |
encobjProps = NULL; /* qemuMonitorAddObject consumes */
|
|
|
6ae9ed |
if (rv < 0)
|
|
|
6ae9ed |
goto exit_monitor;
|
|
|
6ae9ed |
+ encobjAdded = true;
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
- encobjAdded = true;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
if (qemuMonitorAddDrive(priv->mon, drivestr) < 0)
|
|
|
6ae9ed |
goto exit_monitor;
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.9.2
|
|
|
6ae9ed |
|