From nobody Fri May 16 08:33:37 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 149686367497220.868936643248276; Wed, 7 Jun 2017 12:27:54 -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 53FE037E66; Wed, 7 Jun 2017 19:27:44 +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 1AC788EC06; Wed, 7 Jun 2017 19:27:44 +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 BBE384A494; Wed, 7 Jun 2017 19:27:43 +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 v57JRRJ9028594 for ; Wed, 7 Jun 2017 15:27:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id A6DD3189B1; Wed, 7 Jun 2017 19:27:27 +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 2DF1A18A5E for ; Wed, 7 Jun 2017 19:27:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 53FE037E66 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.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 53FE037E66 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Wed, 7 Jun 2017 21:25:00 +0200 Message-Id: <6f51d3a0fb6525714a1ad128ca26997711cfffe9.1496863202.git.jtomko@redhat.com> 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 10/14] Add virtio-related options to rng devices 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.29]); Wed, 07 Jun 2017 19:27:44 +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 | 11 +++++++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 19 +++++++++++++++= ++++ src/conf/domain_conf.h | 1 + .../qemuxml2argvdata/qemuxml2argv-virtio-options.xml | 1 + 5 files changed, 37 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index efd7a5f..fd2195a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -7064,6 +7064,17 @@ qemu-kvm -net nic,model=3D? /dev/null +
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 =20 diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8ff553d..c7a0867 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4966,6 +4966,11 @@ + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9c71c8a..c6f5d93 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12949,6 +12949,9 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlop= t, if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; =20 + if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0) + goto error; + cleanup: VIR_FREE(model); VIR_FREE(backend); @@ -19663,6 +19666,10 @@ virDomainRNGDefCheckABIStability(virDomainRNGDefPt= r src, return false; } =20 + if (src->virtio && dst->virtio && + !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio)) + return false; + if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info)) return false; =20 @@ -23176,6 +23183,7 @@ virDomainRNGDefFormat(virBufferPtr buf, { const char *model =3D virDomainRNGModelTypeToString(def->model); const char *backend =3D virDomainRNGBackendTypeToString(def->backend); + virBuffer driverBuf =3D VIR_BUFFER_INITIALIZER; =20 virBufferAsprintf(buf, "\n", model); virBufferAdjustIndent(buf, 2); @@ -23204,6 +23212,16 @@ virDomainRNGDefFormat(virBufferPtr buf, break; } =20 + virDomainVirtioOptionsFormat(&driverBuf, def->virtio); + if (virBufferCheckError(&driverBuf) < 0) + return -1; + + if (virBufferUse(&driverBuf)) { + virBufferAddLit(buf, "\n"); + } + if (virDomainDeviceInfoNeedsFormat(&def->info, flags)) { if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) return -1; @@ -23232,6 +23250,7 @@ virDomainRNGDefFree(virDomainRNGDefPtr def) } =20 virDomainDeviceInfoClear(&def->info); + VIR_FREE(def->virtio); VIR_FREE(def); } =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index acb6748..4025874 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2020,6 +2020,7 @@ struct _virDomainRNGDef { } source; =20 virDomainDeviceInfo info; + virDomainVirtioOptionsPtr virtio; }; =20 typedef enum { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml b/tests= /qemuxml2argvdata/qemuxml2argv-virtio-options.xml index 33da214..b7b9501 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml @@ -80,6 +80,7 @@ /dev/random +
--=20 2.10.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list