From 6f59749e4e1ecaef0f7c252e5a57f5cd569f7ea3 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Tue, 21 Jul 2020 15:47:29 +0200 Subject: [PATCH] qemu: Drop ret variable from qemuConnectCPUModelComparison MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko --- src/qemu/qemu_driver.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 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) - virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL); - else - ret = VIR_CPU_COMPARE_INCOMPATIBLE; + return VIR_CPU_COMPARE_IDENTICAL; - return ret; + if (STREQ(result, "superset")) + return VIR_CPU_COMPARE_SUPERSET; + + if (failIncompatible) { + virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL); + return VIR_CPU_COMPARE_ERROR; + } + + return VIR_CPU_COMPARE_INCOMPATIBLE; }