[PATCH 24/37] qemuBuildHostNetProps: Remove 'vhostfd' machinery

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_command.c | 11 ----------- src/qemu/qemu_command.h | 2 -- src/qemu/qemu_hotplug.c | 1 - 3 files changed, 14 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d30c0de748..d23baa54a2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4189,8 +4189,6 @@ virJSONValue * qemuBuildHostNetProps(virDomainNetDef *net, char **tapfd, size_t tapfdSize, - char **vhostfd, - size_t vhostfdSize, const char *slirpfd) { virDomainNetType netType = virDomainNetGetActualType(net); @@ -4256,14 +4254,6 @@ qemuBuildHostNetProps(virDomainNetDef *net, if (nfds > 1) vhostfd_field = "s:vhostfds"; - } else if (vhostfdSize > 0) { - vhost = true; - - for (i = 0; i < vhostfdSize; i++) - virBufferAsprintf(&buf, "%s:", vhostfd[i]); - - if (vhostfdSize > 1) - vhostfd_field = "s:vhostfds"; } virBufferTrim(&buf, ":"); @@ -8948,7 +8938,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, if (!(hostnetprops = qemuBuildHostNetProps(net, tapfdName, tapfdSize, - NULL, 0, slirpfdName))) goto cleanup; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 3b487a647c..c26305927e 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -89,8 +89,6 @@ virJSONValue * qemuBuildHostNetProps(virDomainNetDef *net, char **tapfd, size_t tapfdSize, - char **vhostfd, - size_t vhostfdSize, const char *slirpfd); int diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 68e8030929..17fe072e02 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1426,7 +1426,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, if (!(netprops = qemuBuildHostNetProps(net, tapfdName, tapfdSize, - NULL, 0, slirpfdName))) goto cleanup; -- 2.35.1