[libvirt PATCH 7/7] qemu: simplify qemuProcessSetupRawIO

[Ján Tomko]

Remove the now unused 'driver' parameter, as well as the pointless
if (ret == 0) comparison which is always true after removing the
cleanup label.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_process.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 6203efef3a..7ff4dc1835 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5022,8 +5022,7 @@ qemuProcessSetupGraphics(virQEMUDriver *driver,
 
 
 static int
-qemuProcessSetupRawIO(virQEMUDriver *driver G_GNUC_UNUSED,
-                      virDomainObj *vm,
+qemuProcessSetupRawIO(virDomainObj *vm,
                       virCommand *cmd G_GNUC_UNUSED)
 {
     bool rawio = false;
@@ -5062,8 +5061,7 @@ qemuProcessSetupRawIO(virQEMUDriver *driver G_GNUC_UNUSED,
 
     if (rawio) {
 #ifdef CAP_SYS_RAWIO
-        if (ret == 0)
-            virCommandAllowCap(cmd, CAP_SYS_RAWIO);
+        virCommandAllowCap(cmd, CAP_SYS_RAWIO);
 #else
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("Raw I/O is not supported on this platform"));
@@ -7423,7 +7421,7 @@ qemuProcessLaunch(virConnectPtr conn,
         goto cleanup;
 
     VIR_DEBUG("Setting up raw IO");
-    if (qemuProcessSetupRawIO(driver, vm, cmd) < 0)
+    if (qemuProcessSetupRawIO(vm, cmd) < 0)
         goto cleanup;
 
     virCommandSetPreExecHook(cmd, qemuProcessHook, &hookData);
-- 
2.31.1