From nobody Thu May 15 13:14:59 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1505917655522267.6775875509835; Wed, 20 Sep 2017 07:27:35 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F59C81E0A; Wed, 20 Sep 2017 14:27:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3D7A318EF4; Wed, 20 Sep 2017 14:27:34 +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 039A71855948; Wed, 20 Sep 2017 14:27:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v8KE1Kcv017822 for ; Wed, 20 Sep 2017 10:01:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 626825C670; Wed, 20 Sep 2017 14:01:20 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB8545C8B2 for ; Wed, 20 Sep 2017 14:01:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5F59C81E0A Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Sep 2017 16:01:14 +0200 Message-Id: <116f17661c53772ff933fce3353b8c07c0c31310.1505916065.git.phrdina@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] Revert "vhost-user: add support reconnect for vhost-user ports" 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 20 Sep 2017 14:27:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This reverts commit edaf4ebe95a5995585c8ab7bc5b92887286d4431. This uses "reconnect" as attribute for element, but we already have a element for element for chardev devices. Since this is the same feature for different device it should be presented in XML the same way. Signed-off-by: Pavel Hrdina --- docs/formatdomain.html.in | 5 +--- docs/schemas/domaincommon.rng | 5 ---- src/conf/domain_conf.c | 28 ++----------------= ---- .../qemuxml2argv-net-vhostuser-multiq.args | 2 +- .../qemuxml2argv-net-vhostuser-multiq.xml | 2 +- 5 files changed, 5 insertions(+), 37 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1602ed3e95..9ce4620c65 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5673,7 +5673,7 @@ qemu-kvm -net nic,model=3D? /dev/null </interface> <interface type=3D'vhostuser'> <mac address=3D'52:54:00:3b:83:1b'/> - <source type=3D'unix' path=3D'/tmp/vhost2.sock' mode=3D'client' rec= onnect=3D'10'/> + <source type=3D'unix' path=3D'/tmp/vhost2.sock' mode=3D'client'/> <model type=3D'virtio'/> <driver queues=3D'5'/> </interface> @@ -5689,9 +5689,6 @@ qemu-kvm -net nic,model=3D? /dev/null are supported. vhost-user requires the virtio model type, thus the <model> element is mandatory. - Since 3.7.0 the element has an optional - attribute reconnect which configures reconnect timeout - (in seconds) if the connection is lost.

=20
Traffic filtering with NWFilter
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 36e2966f21..76852abb3c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2388,11 +2388,6 @@ client - - - - - diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f3b4dd33da..cc5e79b70b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10240,7 +10240,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, char *vhostuser_mode =3D NULL; char *vhostuser_path =3D NULL; char *vhostuser_type =3D NULL; - char *vhostuser_reconnect =3D NULL; char *trustGuestRxFilters =3D NULL; char *vhost_path =3D NULL; virNWFilterHashTablePtr filterparams =3D NULL; @@ -10327,12 +10326,11 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xml= opt, goto error; } } else if (!vhostuser_path && !vhostuser_mode && !vhostuser_ty= pe - && !vhostuser_reconnect && def->type =3D=3D VIR_DOM= AIN_NET_TYPE_VHOSTUSER - && virXMLNodeNameEqual(cur, "source")) { + && def->type =3D=3D VIR_DOMAIN_NET_TYPE_VHOSTUSER && + virXMLNodeNameEqual(cur, "source")) { vhostuser_type =3D virXMLPropString(cur, "type"); vhostuser_path =3D virXMLPropString(cur, "path"); vhostuser_mode =3D virXMLPropString(cur, "mode"); - vhostuser_reconnect =3D virXMLPropString(cur, "reconnect"); } else if (!def->virtPortProfile && virXMLNodeNameEqual(cur, "virtualport")) { if (def->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -10554,24 +10552,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlo= pt, =20 if (STREQ(vhostuser_mode, "server")) { def->data.vhostuser->data.nix.listen =3D true; - if (vhostuser_reconnect) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("'reconnect' attribute unsupported " - "'server' mode for ")); - goto error; - } } else if (STREQ(vhostuser_mode, "client")) { def->data.vhostuser->data.nix.listen =3D false; - if (vhostuser_reconnect) { - def->data.vhostuser->data.nix.reconnect.enabled =3D true; - if (virStrToLong_ui(vhostuser_reconnect, NULL, 10, - &def->data.vhostuser->data.nix.reconne= ct.timeout) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid vhostuser reconnect value %s= "), - vhostuser_reconnect); - goto error; - } - } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Wrong 'mode' attribute " @@ -11016,7 +10998,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, VIR_FREE(portgroup); VIR_FREE(address); VIR_FREE(port); - VIR_FREE(vhostuser_reconnect); VIR_FREE(vhostuser_type); VIR_FREE(vhostuser_path); VIR_FREE(vhostuser_mode); @@ -23002,11 +22983,6 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " mode=3D'%s'", def->data.vhostuser->data.nix.listen ? "server" : "client"); - if (def->data.vhostuser->data.nix.reconnect.enabled =3D=3D= true) { - virBufferAsprintf(buf, " reconnect=3D'%u'", - def->data.vhostuser->data.nix.reconn= ect.timeout); - } - sourceLines++; } break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args = b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index 996828f7d8..b69ebd8bad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -32,7 +32,7 @@ addr=3D0x4 \ -netdev socket,listen=3D:2015,id=3Dhostnet2 \ -device rtl8139,netdev=3Dhostnet2,id=3Dnet2,mac=3D52:54:00:95:db:c0,bus=3D= pci.0,\ addr=3D0x5 \ --chardev socket,id=3Dcharnet3,path=3D/tmp/vhost2.sock,reconnect=3D10 \ +-chardev socket,id=3Dcharnet3,path=3D/tmp/vhost2.sock \ -netdev vhost-user,chardev=3Dcharnet3,queues=3D4,id=3Dhostnet3 \ -device virtio-net-pci,mq=3Don,vectors=3D10,netdev=3Dhostnet3,id=3Dnet3,\ mac=3D52:54:00:ee:96:6d,bus=3Dpci.0,addr=3D0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml b= /tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml index 7eb6fa0bbf..d5c42fe62c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml @@ -40,7 +40,7 @@ - + --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list