From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 3 Sep 2024 08:03:04 +0000 (+0200)
Subject: qemuProcessSetupRawIO: Refactor return value and remove useless #ifdef
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=61c8a7180e90660d12f7415b81c2706a6e2e0592;p=libvirt.git

qemuProcessSetupRawIO: Refactor return value and remove useless #ifdef

The function can return directly rather than setting 'ret' as there's no
cleanup.

It also doesn't make sense to conditionally compile out the 'break'
statement when checking whether a disk has rawio enabled if
'CAP_SYS_RAWIO' is _not_ defined as the function will still behave the
same.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 242c93284e..2e4ee9e305 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5183,7 +5183,6 @@ qemuProcessSetupRawIO(virDomainObj *vm,
 {
     bool rawio = false;
     size_t i;
-    int ret = -1;
 
     /* in case a certain disk is desirous of CAP_SYS_RAWIO, add this */
     for (i = 0; i < vm->def->ndisks; i++) {
@@ -5191,9 +5190,7 @@ qemuProcessSetupRawIO(virDomainObj *vm,
 
         if (disk->rawio == VIR_TRISTATE_BOOL_YES) {
             rawio = true;
-#ifndef CAP_SYS_RAWIO
             break;
-#endif
         }
     }
 
@@ -5213,18 +5210,16 @@ qemuProcessSetupRawIO(virDomainObj *vm,
         }
     }
 
-    ret = 0;
-
     if (rawio) {
 #ifdef CAP_SYS_RAWIO
         virCommandAllowCap(cmd, CAP_SYS_RAWIO);
 #else
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("Raw I/O is not supported on this platform"));
-        ret = -1;
+        return -1;
 #endif
     }
-    return ret;
+    return 0;
 }