From nobody Tue Dec 16 06:37:31 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; 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 15269064681213.1561770522566803; Mon, 21 May 2018 05:41:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 88B9514E107; Mon, 21 May 2018 12:41:05 +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 43C2D20075AC; Mon, 21 May 2018 12:41:05 +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 DA46D4BB78; Mon, 21 May 2018 12:41:04 +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 w4LCesFX028017 for ; Mon, 21 May 2018 08:40:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 31BEE5C261; Mon, 21 May 2018 12:40:54 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-225.phx2.redhat.com [10.3.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id E34315C1A1 for ; Mon, 21 May 2018 12:40:53 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Mon, 21 May 2018 08:40:44 -0400 Message-Id: <20180521124045.4130-8-jferlan@redhat.com> In-Reply-To: <20180521124045.4130-1-jferlan@redhat.com> References: <20180521124045.4130-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 7/8] schema: Fix capability grammar for pagesElem 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.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 21 May 2018 12:41:06 +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=3D1572491 Commit id '02129b7c0' added a single pagesElem for slightly different purposes. One usage was an output for host page size listing and the other for NUMA supported page sizes. For the former, only the pages unit and size are formatted, while for the latter the pages unit, size, and availability data is formatted. The virt-xml-validate would fail because it expected something extra in the host page size output. So split up pagesElem a bit and create pagesHost and pagesNuma for the differences. Modify some capabilityschemadata output to have the output - even though the results may not be realistic with respect to the original incarnation of the data. Signed-off-by: John Ferlan --- docs/schemas/capability.rng | 30 +++++++++++++++++++--------= --- tests/capabilityschemadata/caps-test2.xml | 3 +++ tests/capabilityschemadata/caps-test3.xml | 6 ++++++ 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index e1b7858540..66c5de62e5 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -129,7 +129,7 @@ - + =20 @@ -203,7 +203,7 @@ =20 - + =20 @@ -484,17 +484,25 @@ =20 - + - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/tests/capabilityschemadata/caps-test2.xml b/tests/capabilitysc= hemadata/caps-test2.xml index 652fc71e0b..125a322998 100644 --- a/tests/capabilityschemadata/caps-test2.xml +++ b/tests/capabilityschemadata/caps-test2.xml @@ -24,6 +24,9 @@ + + + diff --git a/tests/capabilityschemadata/caps-test3.xml b/tests/capabilitysc= hemadata/caps-test3.xml index 479db30612..8294f44425 100644 --- a/tests/capabilityschemadata/caps-test3.xml +++ b/tests/capabilityschemadata/caps-test3.xml @@ -28,6 +28,9 @@ + + + @@ -42,6 +45,9 @@ 12572412 + 4011249 + 0 + 0 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list