From nobody Sun Feb 8 18:33:17 2026 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 1490282904849809.6323209915729; Thu, 23 Mar 2017 08:28:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 345EA4E357; Thu, 23 Mar 2017 15:28:24 +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 0661E7E859; Thu, 23 Mar 2017 15:28:24 +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 AAEA718523CB; Thu, 23 Mar 2017 15:28:23 +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 v2NFQYb1021000 for ; Thu, 23 Mar 2017 11:26:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 046B11915A; Thu, 23 Mar 2017 15:26:34 +0000 (UTC) Received: from dnr.brq.redhat.com (dhcp129-199.brq.redhat.com [10.34.129.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FD921916A for ; Thu, 23 Mar 2017 15:26:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 345EA4E357 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.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 345EA4E357 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 23 Mar 2017 16:26:20 +0100 Message-Id: <5a8f1a959ecb63654c09e6ee5089ae18168cbdb2.1490282724.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] [PATCH 8/9] conf: add caching attribute to iommu device 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 23 Mar 2017 15:28:24 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add a new attribute to control the caching mode. https://bugzilla.redhat.com/show_bug.cgi?id=3D1427005 --- docs/formatdomain.html.in | 9 +++++++ docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 23 +++++++++++++++--- src/conf/domain_conf.h | 1 + .../qemuxml2argv-intel-iommu-caching.xml | 28 ++++++++++++++++++= ++++ .../qemuxml2xmlout-intel-iommu-caching.xml | 28 ++++++++++++++++++= ++++ tests/qemuxml2xmltest.c | 2 ++ 7 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching= .xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-cac= hing.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6b196d4..f3c44ae 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -7314,6 +7314,15 @@ qemu-kvm -net nic,model=3D? /dev/null (QEMU only)

+
caching
+
+

+ The caching attribute with possible values + on and off can be used to + turn on the caching mode. Since 3.3.0<= /span> + (QEMU only) +

+
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 68f3680..49adf69 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3896,6 +3896,11 @@ + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index da0c9f0..6bcf84e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13944,6 +13944,15 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, iommu->intremap =3D val; } =20 + VIR_FREE(tmp); + if ((tmp =3D virXPathString("string(./driver/@caching)", ctxt))) { + if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_XML_ERROR, _("unknown caching value: %s= "), tmp); + goto cleanup; + } + iommu->caching =3D val; + } + ret =3D iommu; iommu =3D NULL; =20 @@ -23864,9 +23873,17 @@ virDomainIOMMUDefFormat(virBufferPtr buf, =20 virBufferAdjustIndent(&childBuf, virBufferGetIndent(buf, false) + 2); =20 - if (iommu->intremap) { - virBufferAsprintf(&childBuf, "\n", - virTristateSwitchTypeToString(iommu->intremap)); + if (iommu->intremap || iommu->caching) { + virBufferAddLit(&childBuf, "intremap) { + virBufferAsprintf(&childBuf, " intremap=3D'%s'", + virTristateSwitchTypeToString(iommu->intrema= p)); + } + if (iommu->caching) { + virBufferAsprintf(&childBuf, " caching=3D'%s'", + virTristateSwitchTypeToString(iommu->caching= )); + } + virBufferAddLit(&childBuf, "/>\n"); } =20 virBufferAsprintf(buf, " + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + +
+ + + + + + + + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xm= l b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xml new file mode 100644 index 0000000..b3ce6b4 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xml @@ -0,0 +1,28 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + +
+ + + + + + + + + diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 8afd830..20add1b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1126,6 +1126,8 @@ mymain(void) QEMU_CAPS_MACHINE_IOMMU); DO_TEST("intel-iommu-irqchip", QEMU_CAPS_DEVICE_INTEL_IOMMU); + DO_TEST("intel-iommu-caching", + QEMU_CAPS_DEVICE_INTEL_IOMMU); =20 DO_TEST("cpu-check-none", NONE); DO_TEST("cpu-check-partial", NONE); --=20 2.10.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list