qemu: Drop ret variable from qemuConnectCPUModelComparison

[libvirt PATCH] qemu: Drop ret variable from qemuConnectCPUModelComparison

Jiri Denemark posted 1 patch 3 years, 9 months ago

Download mbox

Test syntax-check failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/e532b40d22ddd5b80dc45babf2c030ebccea1c6a.1595339275.git.jdenemar@redhat.com

src/qemu/qemu_driver.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

Expand all Fold all

[libvirt PATCH] qemu: Drop ret variable from qemuConnectCPUModelComparison

Posted by Jiri Denemark 3 years, 9 months ago

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_driver.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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;
 }
 
 
-- 
2.27.0

Re: [libvirt PATCH] qemu: Drop ret variable from qemuConnectCPUModelComparison

Posted by Ján Tomko 3 years, 9 months ago

On a Tuesday in 2020, Jiri Denemark wrote:
>Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
>---
> src/qemu/qemu_driver.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano