From 4438b8ac09549d6ee989597f79836ccf38ade502 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 16 May 2022 17:17:20 +0200
Subject: [PATCH] qemuFDPassTransferCommand: Remove return value
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now that the 'direct' mode was separated and thus we don't have any
possible error case we can stop returning any values and simplify
callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_command.c | 18 +++++-------------
 src/qemu/qemu_fd.c      |  6 ++----
 src/qemu/qemu_fd.h      |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a8a2ffb70b..784e66bfd1 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1513,9 +1513,7 @@ qemuBuildChardevCommand(virCommand *cmd,
         break;
 
     case VIR_DOMAIN_CHR_TYPE_FILE:
-        if (qemuFDPassTransferCommand(chrSourcePriv->sourcefd, cmd) < 0)
-            return -1;
-
+        qemuFDPassTransferCommand(chrSourcePriv->sourcefd, cmd);
         break;
 
     case VIR_DOMAIN_CHR_TYPE_UNIX:
@@ -1543,8 +1541,7 @@ qemuBuildChardevCommand(virCommand *cmd,
         return -1;
     }
 
-    if (qemuFDPassTransferCommand(chrSourcePriv->logfd, cmd) < 0)
-        return -1;
+    qemuFDPassTransferCommand(chrSourcePriv->logfd, cmd);
 
     if (!(charstr = qemuBuildChardevStr(dev, charAlias)))
         return -1;
@@ -8888,9 +8885,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
         qemuFDPassDirectTransferCommand(n->data, cmd);
 
     qemuFDPassDirectTransferCommand(netpriv->slirpfd, cmd);
-
-    if (qemuFDPassTransferCommand(netpriv->vdpafd, cmd) < 0)
-        return -1;
+    qemuFDPassTransferCommand(netpriv->vdpafd, cmd);
 
     if (!(hostnetprops = qemuBuildHostNetProps(net)))
         goto cleanup;
@@ -9778,11 +9773,8 @@ qemuBuildTPMCommandLine(virCommand *cmd,
         return -1;
     }
 
-    if (qemuFDPassTransferCommand(passtpm, cmd) < 0)
-        return -1;
-
-    if (qemuFDPassTransferCommand(passcancel, cmd) < 0)
-        return -1;
+    qemuFDPassTransferCommand(passtpm, cmd);
+    qemuFDPassTransferCommand(passcancel, cmd);
 
     if (!(tpmdevstr = qemuBuildTPMBackendStr(tpm, passtpm, passcancel)))
         return -1;
diff --git a/src/qemu/qemu_fd.c b/src/qemu/qemu_fd.c
index bedd39b121..7ea52bd2dc 100644
--- a/src/qemu/qemu_fd.c
+++ b/src/qemu/qemu_fd.c
@@ -133,14 +133,14 @@ qemuFDPassAddFD(qemuFDPass *fdpass,
  * Pass the fds in @fdpass to a commandline object @cmd. @fdpass may be NULL
  * in which case this is a no-op.
  */
-int
+void
 qemuFDPassTransferCommand(qemuFDPass *fdpass,
                           virCommand *cmd)
 {
     size_t i;
 
     if (!fdpass)
-        return 0;
+        return;
 
     for (i = 0; i < fdpass->nfds; i++) {
         g_autofree char *arg = g_strdup_printf("set=%u,fd=%d,opaque=%s",
@@ -152,8 +152,6 @@ qemuFDPassTransferCommand(qemuFDPass *fdpass,
         fdpass->fds[i].fd = -1;
         virCommandAddArgList(cmd, "-add-fd", arg, NULL);
     }
-
-    return 0;
 }
 
 
diff --git a/src/qemu/qemu_fd.h b/src/qemu/qemu_fd.h
index dbb4ab0aa5..6f165b6be9 100644
--- a/src/qemu/qemu_fd.h
+++ b/src/qemu/qemu_fd.h
@@ -39,7 +39,7 @@ qemuFDPassAddFD(qemuFDPass *fdpass,
                 int *fd,
                 const char *suffix);
 
-int
+void
 qemuFDPassTransferCommand(qemuFDPass *fdpass,
                           virCommand *cmd);