From e565b9cd0cc9907201ce1e3203be10bb0579e8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Fri, 18 May 2018 15:41:25 +0200 Subject: [PATCH] Remove type_sep parameter from qemuBuildHostNetStr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The last caller not passing a comma was removed by: commit ad8a7c4f8599bd58608500a72cdfec18a6bf2318 Author: Ján Tomko CommitDate: 2018-04-12 17:17:16 +0200 qemu: deprecate QEMU_CAPS_NETDEV Signed-off-by: Ján Tomko Reviewed-by: John Ferlan --- src/qemu/qemu_command.c | 28 +++++++++++----------------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f3724a766b..9da2d609e8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3546,7 +3546,6 @@ qemuBuildNicDevStr(virDomainDefPtr def, char * qemuBuildHostNetStr(virDomainNetDefPtr net, virQEMUDriverPtr driver, - char type_sep, int vlan, char **tapfd, size_t tapfdSize, @@ -3578,7 +3577,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferAsprintf(&buf, "tap%c", type_sep); + virBufferAddLit(&buf, "tap,"); /* for one tapfd 'fd=' shall be used, * for more than one 'fds=' is the right choice */ if (tapfdSize == 1) { @@ -3596,30 +3595,26 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_CLIENT: - virBufferAsprintf(&buf, "socket%cconnect=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,connect=%s:%d,", net->data.socket.address, net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_SERVER: - virBufferAsprintf(&buf, "socket%clisten=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,listen=%s:%d,", net->data.socket.address ? net->data.socket.address : "", net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_MCAST: - virBufferAsprintf(&buf, "socket%cmcast=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,mcast=%s:%d,", net->data.socket.address, net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_UDP: - virBufferAsprintf(&buf, "socket%cudp=%s:%d,localaddr=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,udp=%s:%d,localaddr=%s:%d,", net->data.socket.address, net->data.socket.port, net->data.socket.localaddr, @@ -3627,7 +3622,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_USER: - virBufferAsprintf(&buf, "user%c", type_sep); + virBufferAddLit(&buf, "user,"); for (i = 0; i < net->guestIP.nips; i++) { const virNetDevIPAddr *ip = net->guestIP.ips[i]; const char *prefix = ""; @@ -3649,12 +3644,11 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_INTERNAL: - virBufferAsprintf(&buf, "user%c", type_sep); + virBufferAddLit(&buf, "user,"); break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: - virBufferAsprintf(&buf, "vhost-user%cchardev=char%s,", - type_sep, + virBufferAsprintf(&buf, "vhost-user,chardev=char%s,", net->info.alias); if (net->driver.virtio.queues > 1) virBufferAsprintf(&buf, "queues=%u,", @@ -8086,7 +8080,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, } if (!(netdev = qemuBuildHostNetStr(net, driver, - ',', -1, + -1, NULL, 0, NULL, 0))) goto error; @@ -8387,7 +8381,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, if (qemuDomainSupportsNicdev(def, net)) { if (!(host = qemuBuildHostNetStr(net, driver, - ',', vlan, + vlan, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; @@ -8403,7 +8397,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, virCommandAddArgList(cmd, "-net", nic, NULL); if (!(host = qemuBuildHostNetStr(net, driver, - ',', vlan, + vlan, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 28bc33558b..bbbf152660 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -80,7 +80,6 @@ qemuBuildChrDeviceStr(char **deviceStr, /* With vlan == -1, use netdev syntax, else old hostnet */ char *qemuBuildHostNetStr(virDomainNetDefPtr net, virQEMUDriverPtr driver, - char type_sep, int vlan, char **tapfd, size_t tapfdSize, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1933a966e5..b35594be5f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1120,7 +1120,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } if (!(netstr = qemuBuildHostNetStr(net, driver, - ',', -1, + -1, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup;