render / rpms / libvirt

Forked from rpms/libvirt 9 months ago
Clone
6ae9ed
From 3969a0495e73417fb15af3b0271ab8986eb56389 Mon Sep 17 00:00:00 2001
6ae9ed
Message-Id: <3969a0495e73417fb15af3b0271ab8986eb56389@dist-git>
6ae9ed
From: John Ferlan <jferlan@redhat.com>
6ae9ed
Date: Mon, 25 Jul 2016 12:43:02 -0400
6ae9ed
Subject: [PATCH] qemu: Move setting of encobjAdded for
6ae9ed
 qemuDomainAttachSCSIDisk
6ae9ed
6ae9ed
https://bugzilla.redhat.com/show_bug.cgi?id=1301021
6ae9ed
6ae9ed
A post push realization that the boolean should be set inside the condition
6ae9ed
6ae9ed
(cherry picked from commit 4f5debbeb4bf39049f212572a249da0483d6d3bb)
6ae9ed
Signed-off-by: John Ferlan <jferlan@redhat.com>
6ae9ed
---
6ae9ed
 src/qemu/qemu_hotplug.c | 2 +-
6ae9ed
 1 file changed, 1 insertion(+), 1 deletion(-)
6ae9ed
6ae9ed
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
6ae9ed
index 1fa1010..394fdf4 100644
6ae9ed
--- a/src/qemu/qemu_hotplug.c
6ae9ed
+++ b/src/qemu/qemu_hotplug.c
6ae9ed
@@ -652,8 +652,8 @@ qemuDomainAttachSCSIDisk(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