From nobody Fri May 16 08:01:12 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.zoho.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 1496863698256678.9616099889331; Wed, 7 Jun 2017 12:28:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5184D1766D0; Wed, 7 Jun 2017 19:28:02 +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 B54087FB5E; Wed, 7 Jun 2017 19:28:01 +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 2806818521CD; Wed, 7 Jun 2017 19:27:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v57JRScl028623 for ; Wed, 7 Jun 2017 15:27:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7787818AB7; Wed, 7 Jun 2017 19:27:28 +0000 (UTC) Received: from icr.brq.redhat.com (dhcp129-58.brq.redhat.com [10.34.129.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2AFB18A82 for ; Wed, 7 Jun 2017 19:27:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5184D1766D0 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5184D1766D0 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Wed, 7 Jun 2017 21:25:01 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCHv3 11/14] Add virtio-related options to video 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 07 Jun 2017 19:28:02 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1283251 --- docs/formatdomain.html.in | 12 ++++++++++ docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 27 ++++++++++++++++++= ++-- src/conf/domain_conf.h | 1 + .../qemuxml2argv-virtio-options.xml | 1 + 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fd2195a..d7af60f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6136,6 +6136,18 @@ qemu-kvm -net nic,model=3D? /dev/null The optional address sub-element can be used to tie the video device to a particular PCI slot. + +
driver
+
+ The subelement driver can be used to tune the device: +
+
virtio options
+
+ Virtio-specific options can also= be + set. (Since 3.5.0) +
+
+
=20

Consoles, serial, parallel & chann= el devices

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c7a0867..0955fc8 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3219,6 +3219,11 @@ + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c6f5d93..d3bbbac 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2352,6 +2352,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def) virDomainDeviceInfoClear(&def->info); =20 VIR_FREE(def->accel); + VIR_FREE(def->virtio); VIR_FREE(def); } =20 @@ -13525,11 +13526,13 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node) =20 static virDomainVideoDefPtr virDomainVideoDefParseXML(xmlNodePtr node, + xmlXPathContextPtr ctxt, const virDomainDef *dom, unsigned int flags) { virDomainVideoDefPtr def; xmlNodePtr cur; + xmlNodePtr saved =3D ctxt->node; char *type =3D NULL; char *heads =3D NULL; char *vram =3D NULL; @@ -13538,6 +13541,8 @@ virDomainVideoDefParseXML(xmlNodePtr node, char *vgamem =3D NULL; char *primary =3D NULL; =20 + ctxt->node =3D node; + if (VIR_ALLOC(def) < 0) return NULL; =20 @@ -13639,7 +13644,12 @@ virDomainVideoDefParseXML(xmlNodePtr node, if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; =20 + if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0) + goto error; + cleanup: + ctxt->node =3D saved; + VIR_FREE(type); VIR_FREE(ram); VIR_FREE(vram); @@ -14438,7 +14448,7 @@ virDomainDeviceDefParse(const char *xmlStr, goto error; break; case VIR_DOMAIN_DEVICE_VIDEO: - if (!(dev->data.video =3D virDomainVideoDefParseXML(node, def, fla= gs))) + if (!(dev->data.video =3D virDomainVideoDefParseXML(node, ctxt, de= f, flags))) goto error; break; case VIR_DOMAIN_DEVICE_HOSTDEV: @@ -18373,7 +18383,7 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainVideoDefPtr video; ssize_t insertAt =3D -1; =20 - if (!(video =3D virDomainVideoDefParseXML(nodes[i], def, flags))) + if (!(video =3D virDomainVideoDefParseXML(nodes[i], ctxt, def, fla= gs))) goto error; =20 if (video->primary) { @@ -19440,6 +19450,10 @@ virDomainVideoDefCheckABIStability(virDomainVideoD= efPtr src, } } =20 + if (src->virtio && dst->virtio && + !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio)) + return false; + if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info)) return false; =20 @@ -23376,6 +23390,7 @@ virDomainVideoDefFormat(virBufferPtr buf, unsigned int flags) { const char *model =3D virDomainVideoTypeToString(def->type); + virBuffer driverBuf =3D VIR_BUFFER_INITIALIZER; =20 if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -23385,6 +23400,14 @@ virDomainVideoDefFormat(virBufferPtr buf, =20 virBufferAddLit(buf, "