[PATCH 04/10] qemu_capabilities: Split conditions in virQEMUCapsInitHostCPUModel

[Jiri Denemark via Devel]

From: Jiri Denemark <jdene...@redhat.com>

Having 'else' after goto is useless.

Signed-off-by: Jiri Denemark <jdene...@redhat.com>
---
 src/qemu/qemu_capabilities.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 581b853589..166d6ed540 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4118,9 +4118,17 @@ virQEMUCapsInitHostCPUModel(virQEMUCaps *qemuCaps,
     if (!(cpu = virQEMUCapsNewHostCPUModel()))
         goto error;
 
-    if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, cpu, false)) < 0) {
+    if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, cpu, false)) < 0)
         goto error;
-    } else if (rc == 1) {
+
+    if (rc == 2) {
+        VIR_DEBUG("QEMU does not provide CPU model for arch=%s virttype=%s",
+                  virArchToString(qemuCaps->arch),
+                  virDomainVirtTypeToString(type));
+        goto error;
+    }
+
+    if (rc == 1) {
         g_autoptr(virDomainCapsCPUModels) cpuModels = NULL;
 
         VIR_DEBUG("No host CPU model info from QEMU; probing host CPU 
directly");
@@ -4131,11 +4139,6 @@ virQEMUCapsInitHostCPUModel(virQEMUCaps *qemuCaps,
 
         virCPUDefCopyModelFilter(cpu, hostCPU, true, 
virQEMUCapsCPUFilterFeatures,
                                  &qemuCaps->arch);
-    } else if (rc == 2) {
-        VIR_DEBUG("QEMU does not provide CPU model for arch=%s virttype=%s",
-                  virArchToString(qemuCaps->arch),
-                  virDomainVirtTypeToString(type));
-        goto error;
     } else if (virQEMUCapsTypeIsAccelerated(type) &&
                virCPUGetHostIsSupported(qemuCaps->arch)) {
         if (!(fullCPU = virQEMUCapsProbeHostCPU(qemuCaps->arch, NULL)))
@@ -4156,9 +4159,10 @@ virQEMUCapsInitHostCPUModel(virQEMUCaps *qemuCaps,
     if (!(migCPU = virQEMUCapsNewHostCPUModel()))
         goto error;
 
-    if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, migCPU, true)) < 0) {
+    if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, migCPU, true)) < 0)
         goto error;
-    } else if (rc == 1) {
+
+    if (rc == 1) {
         VIR_DEBUG("CPU migratability not provided by QEMU");
 
         virCPUDefFree(migCPU);
-- 
2.54.0