From nobody Sat May 4 00:50:53 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 1527852984725323.7301679832341; Fri, 1 Jun 2018 04:36:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0F4E730D2985; Fri, 1 Jun 2018 11:36:23 +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 BBD0F60BE3; Fri, 1 Jun 2018 11:36:22 +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 52B361800FC1; Fri, 1 Jun 2018 11:36:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w51BaAfh025613 for ; Fri, 1 Jun 2018 07:36:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7608339D62; Fri, 1 Jun 2018 11:36:10 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F20DB1C668 for ; Fri, 1 Jun 2018 11:36:09 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 1 Jun 2018 13:36:04 +0200 Message-Id: <9ff27669c6e44387fb7c1f99d6ac85709b41652e.1527852839.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] conf: rename to 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.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 01 Jun 2018 11:36:23 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 To avoid the vs. confusion, change to: Signed-off-by: J=C3=A1n Tomko Suggested-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/formatdomain.html.in | 6 +++--- docs/schemas/domaincommon.rng | 4 ++-- src/conf/domain_conf.c | 20 ++++++++++---------- tests/qemuxml2argvdata/vhost-vsock-auto.xml | 2 +- tests/qemuxml2argvdata/vhost-vsock.xml | 2 +- tests/qemuxml2xmloutdata/vhost-vsock-auto.xml | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b5a6e33bfe..8bb6636ea9 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -8173,8 +8173,8 @@ qemu-kvm -net nic,model=3D? /dev/null =20

A vsock host/guest interface. The model attribute defaults to virtio. - The optional attribute cid of the source element - specifies the CID assigned to the guest. If the attribute + The optional attribute address of the cid + element specifies the CID assigned to the guest. If the attribute auto is set to yes, libvirt will assign a free CID automatically on domain startup. Since 4.4.0

@@ -8183,7 +8183,7 @@ qemu-kvm -net nic,model=3D? /dev/null ... <devices> <vsock model=3D'virtio'> - <source auto=3D'no' cid=3D'3'/> + <cid auto=3D'no' address=3D'3'/> </vsock> </devices> ... diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 703a1bb6f8..b7404e1ce0 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4158,14 +4158,14 @@ - + - + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e40fe7a188..86814d5f64 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15966,7 +15966,7 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xml= opt, { virDomainVsockDefPtr vsock =3D NULL, ret =3D NULL; xmlNodePtr save =3D ctxt->node; - xmlNodePtr source; + xmlNodePtr cid; char *tmp =3D NULL; int val; =20 @@ -15983,11 +15983,11 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr x= mlopt, vsock->model =3D val; } =20 - source =3D virXPathNode("./source", ctxt); + cid =3D virXPathNode("./cid", ctxt); =20 VIR_FREE(tmp); - if (source) { - if ((tmp =3D virXMLPropString(source, "cid"))) { + if (cid) { + if ((tmp =3D virXMLPropString(cid, "address"))) { if (virStrToLong_uip(tmp, NULL, 10, &vsock->guest_cid) < 0 || vsock->guest_cid =3D=3D 0) { virReportError(VIR_ERR_XML_DETAIL, @@ -15998,7 +15998,7 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xml= opt, } =20 VIR_FREE(tmp); - if ((tmp =3D virXMLPropString(source, "auto"))) { + if ((tmp =3D virXMLPropString(cid, "auto"))) { val =3D virTristateBoolTypeFromString(tmp); if (val <=3D 0) { virReportError(VIR_ERR_XML_DETAIL, @@ -26993,7 +26993,7 @@ virDomainVsockDefFormat(virBufferPtr buf, { virBuffer childBuf =3D VIR_BUFFER_INITIALIZER; virBuffer attrBuf =3D VIR_BUFFER_INITIALIZER; - virBuffer sourceAttrBuf =3D VIR_BUFFER_INITIALIZER; + virBuffer cidAttrBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 if (vsock->model) { @@ -27004,12 +27004,12 @@ virDomainVsockDefFormat(virBufferPtr buf, virBufferSetChildIndent(&childBuf, buf); =20 if (vsock->auto_cid !=3D VIR_TRISTATE_BOOL_ABSENT) { - virBufferAsprintf(&sourceAttrBuf, " auto=3D'%s'", + virBufferAsprintf(&cidAttrBuf, " auto=3D'%s'", virTristateBoolTypeToString(vsock->auto_cid)); } if (vsock->guest_cid !=3D 0) - virBufferAsprintf(&sourceAttrBuf, " cid=3D'%u'", vsock->guest_cid); - if (virXMLFormatElement(&childBuf, "source", &sourceAttrBuf, NULL) < 0) + virBufferAsprintf(&cidAttrBuf, " address=3D'%u'", vsock->guest_cid= ); + if (virXMLFormatElement(&childBuf, "cid", &cidAttrBuf, NULL) < 0) goto cleanup; =20 virDomainDeviceInfoFormat(&childBuf, &vsock->info, 0); @@ -27022,7 +27022,7 @@ virDomainVsockDefFormat(virBufferPtr buf, cleanup: virBufferFreeAndReset(&childBuf); virBufferFreeAndReset(&attrBuf); - virBufferFreeAndReset(&sourceAttrBuf); + virBufferFreeAndReset(&cidAttrBuf); return ret; } =20 diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.xml b/tests/qemuxml2ar= gvdata/vhost-vsock-auto.xml index 44b3b15f02..f6619d6cd6 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-auto.xml +++ b/tests/qemuxml2argvdata/vhost-vsock-auto.xml @@ -29,7 +29,7 @@ - + diff --git a/tests/qemuxml2argvdata/vhost-vsock.xml b/tests/qemuxml2argvdat= a/vhost-vsock.xml index 636abbb160..bc550ace4e 100644 --- a/tests/qemuxml2argvdata/vhost-vsock.xml +++ b/tests/qemuxml2argvdata/vhost-vsock.xml @@ -29,7 +29,7 @@ - +
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml b/tests/qemuxml2= xmloutdata/vhost-vsock-auto.xml index 0e0e4a46b4..ef50065063 100644 --- a/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml +++ b/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml @@ -29,7 +29,7 @@ - +
--=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:50:53 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 1527852975741694.181398676508; Fri, 1 Jun 2018 04:36:15 -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 4AA8230B8424; Fri, 1 Jun 2018 11:36:14 +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 1607C100195E; Fri, 1 Jun 2018 11:36:14 +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 825D54CA81; Fri, 1 Jun 2018 11:36:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w51BaBZd025618 for ; Fri, 1 Jun 2018 07:36:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 16C651C668; Fri, 1 Jun 2018 11:36:11 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B04FE1C725 for ; Fri, 1 Jun 2018 11:36:10 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 1 Jun 2018 13:36:05 +0200 Message-Id: <7ec9ea7e4f43e03bcf1f9ff34ca32169329bb148.1527852839.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] news: add vsock 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.47]); Fri, 01 Jun 2018 11:36:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Document the addition of vsock. Signed-off-by: J=C3=A1n Tomko --- docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 453ac1d02a..a2829eff6a 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -113,6 +113,15 @@ libvirt has done as well. + + + qemu: add support for vhost-vsock-device + + + A new vsock device was introduced, allowing communication between + the guest and the host via the AF_VSOCK family. + +
--=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list