From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 10 May 2022 12:38:03 +0000 (+0200)
Subject: qemuBuildHostNetProps: Remove 'vhostfd' machinery
X-Git-Tag: v8.4.0-rc1~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b3e730c77b7b83d09984129dc58aaf8260daf57;p=thirdparty%2Flibvirt.git

qemuBuildHostNetProps: Remove 'vhostfd' machinery

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d756c42e18..ab191a99fc 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4210,8 +4210,6 @@ virJSONValue *
 qemuBuildHostNetProps(virDomainNetDef *net,
                       char **tapfd,
                       size_t tapfdSize,
-                      char **vhostfd,
-                      size_t vhostfdSize,
                       const char *slirpfd)
 {
     virDomainNetType netType = virDomainNetGetActualType(net);
@@ -4277,14 +4275,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, ":");
@@ -8970,7 +8960,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;