From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 19 Jun 2018 15:35:32 +0000 (-0400)
Subject: qemu_command: remove unused LegacyNicStr arg 'prefix'
X-Git-Tag: v4.5.0-rc1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=131ca8f4ff3508ca633906f664cb116b0c78e120;p=thirdparty%2Flibvirt.git

qemu_command: remove unused LegacyNicStr arg 'prefix'

Hardcode the only string that's passed in

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f7038a8c5e..31a0b7761a 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3354,15 +3354,13 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem)
 
 static char *
 qemuBuildLegacyNicStr(virDomainNetDefPtr net,
-                      const char *prefix,
                       int vlan)
 {
     char *str;
     char macaddr[VIR_MAC_STRING_BUFLEN];
 
     ignore_value(virAsprintf(&str,
-                             "%smacaddr=%s,vlan=%d%s%s%s%s",
-                             prefix ? prefix : "",
+                             "nic,macaddr=%s,vlan=%d%s%s%s%s",
                              virMacAddrFormat(&net->mac, macaddr),
                              vlan,
                              (net->model ? ",model=" : ""),
@@ -8517,7 +8515,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
             goto cleanup;
         virCommandAddArgList(cmd, "-device", nic, NULL);
     } else {
-        if (!(nic = qemuBuildLegacyNicStr(net, "nic,", vlan)))
+        if (!(nic = qemuBuildLegacyNicStr(net, vlan)))
             goto cleanup;
         virCommandAddArgList(cmd, "-net", nic, NULL);