From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 26 Aug 2019 20:21:56 +0000 (+0200)
Subject: qemuBuildHostNetStr: remove unused 'driver' argument
X-Git-Tag: v5.8.0-rc1~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a8e03f8867367a7084d72694770bf204a5af3dc;p=thirdparty%2Flibvirt.git

qemuBuildHostNetStr: remove unused 'driver' argument

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d420b98ed4..811c7ead91 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3906,7 +3906,6 @@ qemuBuildNicDevStr(virDomainDefPtr def,
 
 char *
 qemuBuildHostNetStr(virDomainNetDefPtr net,
-                    virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
                     char **tapfd,
                     size_t tapfdSize,
                     char **vhostfd,
@@ -8551,7 +8550,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
     if (chardev)
         virCommandAddArgList(cmd, "-chardev", chardev, NULL);
 
-    if (!(host = qemuBuildHostNetStr(net, driver,
+    if (!(host = qemuBuildHostNetStr(net,
                                      tapfdName, tapfdSize,
                                      vhostfdName, vhostfdSize,
                                      slirpfdName)))
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index ec8e43ace1..f945b2d6d4 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -86,7 +86,6 @@ qemuBuildChrDeviceStr(char **deviceStr,
                       virQEMUCapsPtr qemuCaps);
 
 char *qemuBuildHostNetStr(virDomainNetDefPtr net,
-                          virQEMUDriverPtr driver,
                           char **tapfd,
                           size_t tapfdSize,
                           char **vhostfd,
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index cf0d46fee9..62e505b779 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1383,7 +1383,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
             goto cleanup;
     }
 
-    if (!(netstr = qemuBuildHostNetStr(net, driver,
+    if (!(netstr = qemuBuildHostNetStr(net,
                                        tapfdName, tapfdSize,
                                        vhostfdName, vhostfdSize,
                                        slirpfdName)))