render / rpms / libvirt

Forked from rpms/libvirt 9 months ago
Clone
3e5111
From 595b527d46c885352dce5fd9b2e226a1d17c1ef4 Mon Sep 17 00:00:00 2001
3e5111
Message-Id: <595b527d46c885352dce5fd9b2e226a1d17c1ef4@dist-git>
3e5111
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
3e5111
Date: Mon, 22 May 2017 10:50:56 +0200
3e5111
Subject: [PATCH] Do not release unreserved address in
3e5111
 qemuDomainAttachRNGDevice
3e5111
MIME-Version: 1.0
3e5111
Content-Type: text/plain; charset=UTF-8
3e5111
Content-Transfer-Encoding: 8bit
3e5111
3e5111
Only set releaseaddr to true after the address has been
3e5111
reserved successfully.
3e5111
3e5111
https://bugzilla.redhat.com/show_bug.cgi?id=1452581
3e5111
3e5111
Reviewed-by: John Ferlan <jferlan@redhat.com>
3e5111
(cherry picked from commit f25f30aff548636d0c8782d3eaee049c77548dd5)
3e5111
Signed-off-by: Ján Tomko <jtomko@redhat.com>
3e5111
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
3e5111
---
3e5111
 src/qemu/qemu_hotplug.c | 2 +-
3e5111
 1 file changed, 1 insertion(+), 1 deletion(-)
3e5111
3e5111
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
3e5111
index 6e5678f16..5c3660922 100644
3e5111
--- a/src/qemu/qemu_hotplug.c
3e5111
+++ b/src/qemu/qemu_hotplug.c
3e5111
@@ -2090,7 +2090,6 @@ qemuDomainAttachRNGDevice(virConnectPtr conn,
3e5111
                                             rng->source.file))
3e5111
             goto cleanup;
3e5111
     }
3e5111
-    releaseaddr = true;
3e5111
 
3e5111
     if (rng->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE ||
3e5111
         rng->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
3e5111
@@ -2103,6 +2102,7 @@ qemuDomainAttachRNGDevice(virConnectPtr conn,
3e5111
                                       !rng->info.addr.ccw.assigned) < 0)
3e5111
             goto cleanup;
3e5111
     }
3e5111
+    releaseaddr = true;
3e5111
 
3e5111
     if (qemuDomainNamespaceSetupRNG(driver, vm, rng) < 0)
3e5111
         goto cleanup;
3e5111
-- 
3e5111
2.13.0
3e5111