From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 21 Jul 2020 13:47:29 +0000 (+0200)
Subject: qemu: Drop ret variable from qemuConnectCPUModelComparison
X-Git-Tag: v6.6.0-rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f59749e4e1ecaef0f7c252e5a57f5cd569f7ea3;p=thirdparty%2Flibvirt.git

qemu: Drop ret variable from qemuConnectCPUModelComparison

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b8ba2e3fb9..8e81c30a93 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13150,7 +13150,6 @@ qemuConnectCPUModelComparison(virQEMUCapsPtr qemuCaps,
 {
     g_autoptr(qemuProcessQMP) proc = NULL;
     g_autofree char *result = NULL;
-    int ret = VIR_CPU_COMPARE_ERROR;
 
     if (!(proc = qemuProcessQMPNew(virQEMUCapsGetBinary(qemuCaps),
                                    libDir, runUid, runGid, false)))
@@ -13163,15 +13162,17 @@ qemuConnectCPUModelComparison(virQEMUCapsPtr qemuCaps,
         return VIR_CPU_COMPARE_ERROR;
 
     if (STREQ(result, "identical"))
-        ret = VIR_CPU_COMPARE_IDENTICAL;
-    else if (STREQ(result, "superset"))
-        ret = VIR_CPU_COMPARE_SUPERSET;
-    else if (failIncompatible)
+        return VIR_CPU_COMPARE_IDENTICAL;
+
+    if (STREQ(result, "superset"))
+        return VIR_CPU_COMPARE_SUPERSET;
+
+    if (failIncompatible) {
         virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
-    else
-        ret = VIR_CPU_COMPARE_INCOMPATIBLE;
+        return VIR_CPU_COMPARE_ERROR;
+    }
 
-    return ret;
+    return VIR_CPU_COMPARE_INCOMPATIBLE;
 }