[PATCH 03/11] 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(a)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 a52ba70066..f0d92a2a10 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8676,8 +8676,7 @@ qemuInterfaceVhostuserConnect(virCommand *cmd,
int
qemuBuildInterfaceConnect(virDomainObj *vm,
virDomainNetDef *net,
- virNetDevVPortProfileOp vmop,
- bool standalone)
+ virNetDevVPortProfileOp vmop)
{
qemuDomainObjPrivate *priv = vm->privateData;
@@ -8759,7 +8758,7 @@ qemuBuildInterfaceConnect(virDomainObj *vm,
}
}
- if (vhostfd && !standalone) {
+ if (vhostfd) {
if (qemuInterfaceOpenVhostNet(vm, net) < 0)
return -1;
}
@@ -8775,7 +8774,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
virDomainNetDef *net,
virQEMUCaps *qemuCaps,
virNetDevVPortProfileOp vmop,
- bool standalone,
size_t *nnicindexes,
int **nicindexes)
{
@@ -8793,7 +8791,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) {
@@ -8983,7 +8981,6 @@ qemuBuildNetCommandLine(virQEMUDriver *driver,
virCommand *cmd,
virQEMUCaps *qemuCaps,
virNetDevVPortProfileOp vmop,
- bool standalone,
size_t *nnicindexes,
int **nicindexes)
{
@@ -8997,8 +8994,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;
@@ -10588,8 +10584,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;
--
2.35.3