From nobody Sat May 4 15:52:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526661748785774.4342389309581; Fri, 18 May 2018 09:42:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31DC8C18BF5F; Fri, 18 May 2018 16:42:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 15E1D100191C; Fri, 18 May 2018 16:42:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 56CA44CA95; Fri, 18 May 2018 16:42:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4IGgL2Z001585 for ; Fri, 18 May 2018 12:42:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0AD342026E03; Fri, 18 May 2018 16:42:21 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A44022024CBC for ; Fri, 18 May 2018 16:42:20 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 18 May 2018 18:42:19 +0200 Message-Id: <81fd5c8875c550ac8e8a8590d6030e409c53560c.1526661738.git.jtomko@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] Remove type_sep parameter from qemuBuildHostNetStr X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 18 May 2018 16:42:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The last caller not passing a comma was removed by: commit ad8a7c4f8599bd58608500a72cdfec18a6bf2318 Author: J=C3=A1n Tomko CommitDate: 2018-04-12 17:17:16 +0200 qemu: deprecate QEMU_CAPS_NETDEV Signed-off-by: J=C3=A1n 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=3D' shall be used, * for more than one 'fds=3D' is the right choice */ if (tapfdSize =3D=3D 1) { @@ -3596,30 +3595,26 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; =20 case VIR_DOMAIN_NET_TYPE_CLIENT: - virBufferAsprintf(&buf, "socket%cconnect=3D%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,connect=3D%s:%d,", net->data.socket.address, net->data.socket.port); break; =20 case VIR_DOMAIN_NET_TYPE_SERVER: - virBufferAsprintf(&buf, "socket%clisten=3D%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,listen=3D%s:%d,", net->data.socket.address ? net->data.socket.addr= ess : "", net->data.socket.port); break; =20 case VIR_DOMAIN_NET_TYPE_MCAST: - virBufferAsprintf(&buf, "socket%cmcast=3D%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,mcast=3D%s:%d,", net->data.socket.address, net->data.socket.port); break; =20 case VIR_DOMAIN_NET_TYPE_UDP: - virBufferAsprintf(&buf, "socket%cudp=3D%s:%d,localaddr=3D%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,udp=3D%s:%d,localaddr=3D%s:%d,", net->data.socket.address, net->data.socket.port, net->data.socket.localaddr, @@ -3627,7 +3622,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; =20 case VIR_DOMAIN_NET_TYPE_USER: - virBufferAsprintf(&buf, "user%c", type_sep); + virBufferAddLit(&buf, "user,"); for (i =3D 0; i < net->guestIP.nips; i++) { const virNetDevIPAddr *ip =3D net->guestIP.ips[i]; const char *prefix =3D ""; @@ -3649,12 +3644,11 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; =20 case VIR_DOMAIN_NET_TYPE_INTERNAL: - virBufferAsprintf(&buf, "user%c", type_sep); + virBufferAddLit(&buf, "user,"); break; =20 case VIR_DOMAIN_NET_TYPE_VHOSTUSER: - virBufferAsprintf(&buf, "vhost-user%cchardev=3Dchar%s,", - type_sep, + virBufferAsprintf(&buf, "vhost-user,chardev=3Dchar%s,", net->info.alias); if (net->driver.virtio.queues > 1) virBufferAsprintf(&buf, "queues=3D%u,", @@ -8086,7 +8080,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, } =20 if (!(netdev =3D qemuBuildHostNetStr(net, driver, - ',', -1, + -1, NULL, 0, NULL, 0))) goto error; =20 @@ -8387,7 +8381,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, =20 if (qemuDomainSupportsNicdev(def, net)) { if (!(host =3D qemuBuildHostNetStr(net, driver, - ',', vlan, + vlan, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; @@ -8403,7 +8397,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, virCommandAddArgList(cmd, "-net", nic, NULL); =20 if (!(host =3D 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 =3D=3D -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, } =20 if (!(netstr =3D qemuBuildHostNetStr(net, driver, - ',', -1, + -1, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list