]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu_command: remove unused LegacyNicStr arg 'prefix'
authorCole Robinson <crobinso@redhat.com>
Tue, 19 Jun 2018 15:35:32 +0000 (11:35 -0400)
committerCole Robinson <crobinso@redhat.com>
Wed, 20 Jun 2018 18:26:29 +0000 (14:26 -0400)
Hardcode the only string that's passed in

Signed-off-by: Cole Robinson <crobinso@redhat.com>
src/qemu/qemu_command.c

index f7038a8c5ea1bd5f31fb3a88fdfdf7bc70ea57a4..31a0b7761a225e25bdb4b97bd6a21bbd443846db 100644 (file)
@@ -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);