From: Pavel Mores <pmores@redhat.com>
Date: Fri, 6 Dec 2019 09:45:27 +0000 (+0100)
Subject: qemu: remove nested branching to enhance readability
X-Git-Tag: v6.0.0-rc1~483
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b2a6e8cf754f571f972aaa6d0cca9fba576fee8;p=thirdparty%2Flibvirt.git

qemu: remove nested branching to enhance readability

This is a follow-up to patch series posted in

https://www.redhat.com/archives/libvir-list/2019-November/msg01180.html

It implements a suggestion made by Cole in

https://www.redhat.com/archives/libvir-list/2019-November/msg01207.html

and discussed in follow-up messages as there were no objections to the
change.

The aim is to make the code more readable by replacing nested branching
with a flat structure.

Signed-off-by: Pavel Mores <pmores@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 470d342afc..5b323d26c4 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7914,19 +7914,18 @@ static int
 qemuDomainDefaultVideoDevice(const virDomainDef *def,
                           virQEMUCapsPtr qemuCaps)
 {
-    if (ARCH_IS_PPC64(def->os.arch)) {
+    if (ARCH_IS_PPC64(def->os.arch))
         return VIR_DOMAIN_VIDEO_TYPE_VGA;
-    } else if (qemuDomainIsARMVirt(def) ||
-               qemuDomainIsRISCVVirt(def) ||
-               ARCH_IS_S390(def->os.arch)) {
+    if (qemuDomainIsARMVirt(def) ||
+        qemuDomainIsRISCVVirt(def) ||
+        ARCH_IS_S390(def->os.arch)) {
         return VIR_DOMAIN_VIDEO_TYPE_VIRTIO;
-    } else {
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA))
-            return VIR_DOMAIN_VIDEO_TYPE_CIRRUS;
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VGA))
-            return VIR_DOMAIN_VIDEO_TYPE_VGA;
-        return VIR_DOMAIN_VIDEO_TYPE_DEFAULT;
     }
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA))
+        return VIR_DOMAIN_VIDEO_TYPE_CIRRUS;
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VGA))
+        return VIR_DOMAIN_VIDEO_TYPE_VGA;
+    return VIR_DOMAIN_VIDEO_TYPE_DEFAULT;
 }