From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 18 Sep 2018 15:06:48 +0000 (+0200)
Subject: qemu: Remove unnecessary variables
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9f01f9b4e40aaef3dba7f4bd41c5f8322813ec7d;p=libvirt.git

qemu: Remove unnecessary variables

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 161eede416..1096f0b100 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -804,7 +804,6 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
                                virArch guestarch)
 {
     virCapsGuestPtr guest;
-    bool haskvm = false;
     virCapsGuestMachinePtr *machines = NULL;
     size_t nmachines = 0;
     int ret = -1;
@@ -813,9 +812,6 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
     if (!binary)
         return 0;
 
-    if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM))
-        haskvm = true;
-
     if (virQEMUCapsGetMachineTypesCaps(qemubinCaps, &nmachines, &machines) < 0)
         goto cleanup;
 
@@ -856,15 +852,13 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
                                       NULL) == NULL)
         goto cleanup;
 
-    if (haskvm) {
-        virCapsGuestDomainPtr dom;
-
-        if ((dom = virCapabilitiesAddGuestDomain(guest,
-                                                 VIR_DOMAIN_VIRT_KVM,
-                                                 NULL,
-                                                 NULL,
-                                                 0,
-                                                 NULL)) == NULL) {
+    if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM)) {
+        if (virCapabilitiesAddGuestDomain(guest,
+                                          VIR_DOMAIN_VIRT_KVM,
+                                          NULL,
+                                          NULL,
+                                          0,
+                                          NULL) == NULL) {
             goto cleanup;
         }
     }