From 0b64b75a09281c7eb082477bf36341c918345b6f Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 13 May 2022 13:49:08 +0200
Subject: [PATCH] qemu: command: Don't hide 'vhost' fds from 'standalone'
 command line

We already format a commandline using FD passing for the tap devices so
formatting the 'vhost' file descriptors won't make it any less usable
directly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---
 src/qemu/qemu_command.c | 15 +++++----------
 src/qemu/qemu_command.h |  3 +--
 src/qemu/qemu_hotplug.c |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 2f7b10a3a6..a55adda4e5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8684,8 +8684,7 @@ qemuInterfaceVhostuserConnect(virCommand *cmd,
 int
 qemuBuildInterfaceConnect(virDomainObj *vm,
                           virDomainNetDef *net,
-                          virNetDevVPortProfileOp vmop,
-                          bool standalone)
+                          virNetDevVPortProfileOp vmop)
 {
 
     qemuDomainObjPrivate *priv = vm->privateData;
@@ -8767,7 +8766,7 @@ qemuBuildInterfaceConnect(virDomainObj *vm,
         }
     }
 
-    if (vhostfd && !standalone) {
+    if (vhostfd) {
         if (qemuInterfaceOpenVhostNet(vm, net) < 0)
             return -1;
     }
@@ -8783,7 +8782,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
                               virDomainNetDef *net,
                               virQEMUCaps *qemuCaps,
                               virNetDevVPortProfileOp vmop,
-                              bool standalone,
                               size_t *nnicindexes,
                               int **nicindexes)
 {
@@ -8801,7 +8799,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
     if (qemuDomainValidateActualNetDef(net, qemuCaps) < 0)
         return -1;
 
-    if (qemuBuildInterfaceConnect(vm, net, vmop, standalone) < 0)
+    if (qemuBuildInterfaceConnect(vm, net, vmop) < 0)
         return -1;
 
     switch (actualType) {
@@ -8991,7 +8989,6 @@ qemuBuildNetCommandLine(virQEMUDriver *driver,
                         virCommand *cmd,
                         virQEMUCaps *qemuCaps,
                         virNetDevVPortProfileOp vmop,
-                        bool standalone,
                         size_t *nnicindexes,
                         int **nicindexes)
 {
@@ -9005,8 +9002,7 @@ qemuBuildNetCommandLine(virQEMUDriver *driver,
 
         if (qemuBuildInterfaceCommandLine(driver, vm, cmd, net,
                                           qemuCaps, vmop,
-                                          standalone, nnicindexes,
-                                          nicindexes) < 0)
+                                          nnicindexes, nicindexes) < 0)
             goto error;
 
         last_good_net = i;
@@ -10596,8 +10592,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
     if (qemuBuildFilesystemCommandLine(cmd, def, qemuCaps, priv) < 0)
         return NULL;
 
-    if (qemuBuildNetCommandLine(driver, vm, cmd,
-                                qemuCaps, vmop, standalone,
+    if (qemuBuildNetCommandLine(driver, vm, cmd, qemuCaps, vmop,
                                 nnicindexes, nicindexes) < 0)
         return NULL;
 
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 84877b3d90..9e8eef1e29 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -91,8 +91,7 @@ qemuBuildHostNetProps(virDomainNetDef *net);
 int
 qemuBuildInterfaceConnect(virDomainObj *vm,
                           virDomainNetDef *net,
-                          virNetDevVPortProfileOp vmop,
-                          bool standalone);
+                          virNetDevVPortProfileOp vmop);
 
 /* Current, best practice */
 virJSONValue *
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index cae7b0dd3b..f7fcd9d3f7 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1268,7 +1268,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
      */
     VIR_APPEND_ELEMENT_COPY(vm->def->nets, vm->def->nnets, net);
 
-    if (qemuBuildInterfaceConnect(vm, net, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, false) < 0)
+    if (qemuBuildInterfaceConnect(vm, net, VIR_NETDEV_VPORT_PROFILE_OP_CREATE) < 0)
          return -1;
 
     iface_connected = true;