From nobody Fri Apr 19 09:00:02 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.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 1490702294105498.1188577220207; Tue, 28 Mar 2017 04:58:14 -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 97CAE41A40; Tue, 28 Mar 2017 11:58:12 +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 6BDD68FB10; Tue, 28 Mar 2017 11:58:12 +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 2082318523C8; Tue, 28 Mar 2017 11:58:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2SBw4Ot027397 for ; Tue, 28 Mar 2017 07:58:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9865C7F965; Tue, 28 Mar 2017 11:58:04 +0000 (UTC) Received: from angien.brq.redhat.com (dhcp129-47.brq.redhat.com [10.34.129.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE8A317DE5; Tue, 28 Mar 2017 11:58:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 97CAE41A40 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.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 97CAE41A40 From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 28 Mar 2017 13:58:56 +0200 Message-Id: <01a74a80817360538e0b1e74886c70945a85a0d7.1490702145.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 1/4] tests: schema: Add possibility to validate individual files 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.30]); Tue, 28 Mar 2017 11:58:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Sometimes it may be desired to validate individual files against a schema. Refactor the data structures to unify them and introduce a new macro DO_TEST_FILE(schema, xmlfile) which will test the XML file against the given schema file. --- tests/virschematest.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/tests/virschematest.c b/tests/virschematest.c index faf66d642..beefabc96 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -35,6 +35,7 @@ VIR_LOG_INIT("tests.schematest"); struct testSchemaData { virXMLValidatorPtr validator; + const char *schema; const char *xml_path; }; @@ -140,15 +141,10 @@ testSchemaDirs(const char *schema, virXMLValidatorPtr= validator, ...) } -struct testSchemaFileData { - virXMLValidatorPtr validator; - const char *schema; -}; - static int testSchemaGrammar(const void *opaque) { - struct testSchemaFileData *data =3D (struct testSchemaFileData *) opaq= ue; + struct testSchemaData *data =3D (struct testSchemaData *) opaque; char *schema_path; int ret =3D -1; @@ -171,7 +167,7 @@ static int mymain(void) { int ret =3D 0; - struct testSchemaFileData data; + struct testSchemaData data; memset(&data, 0, sizeof(data)); @@ -196,6 +192,30 @@ mymain(void) } = \ } while (0) +#define DO_TEST_FILE(sch, xmlfile) = \ + do { = \ + data.schema =3D sch; = \ + data.xml_path =3D xmlfile; = \ + if (virTestRun("test schema grammar file: " sch, = \ + testSchemaGrammar, &data) =3D=3D 0) { = \ + /* initialize the validator even if the schema test = \ + * was skipped because of VIR_TEST_RANGE */ = \ + if (!data.validator && testSchemaGrammar(&data) < 0) { = \ + ret =3D -1; = \ + break; = \ + } = \ + if (virTestRun("Checking " xmlfile " against " sch, = \ + testSchemaFile, &data) < 0) = \ + ret =3D -1; = \ + = \ + virXMLValidatorFree(data.validator); = \ + data.validator =3D NULL; = \ + } else { = \ + ret =3D -1; = \ + } = \ + } while (0) + + DO_TEST("capability.rng", "capabilityschemadata", "xencapsdata"); DO_TEST("domain.rng", "domainschemadata", "qemuargv2xmldata", "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata", --=20 2.12.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 19 09:00:02 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.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 1490702295769930.9369889668484; Tue, 28 Mar 2017 04:58:15 -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 7821364D81; Tue, 28 Mar 2017 11:58:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4DBCF93438; Tue, 28 Mar 2017 11:58: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 015001F8; Tue, 28 Mar 2017 11:58:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2SBw5xl027404 for ; Tue, 28 Mar 2017 07:58:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 945607F958; Tue, 28 Mar 2017 11:58:05 +0000 (UTC) Received: from angien.brq.redhat.com (dhcp129-47.brq.redhat.com [10.34.129.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6B8917DE5; Tue, 28 Mar 2017 11:58:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7821364D81 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 7821364D81 From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 28 Mar 2017 13:58:57 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 2/4] news: Introduce rules for the schema file and fix offending lines 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.38]); Tue, 28 Mar 2017 11:58:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add more strict rules for the news file and fix offending entries. --- docs/news.xml | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 17186b954..024b659e8 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -5,9 +5,20 @@ This file will be processed to produce both HTML and plain text versi= ons of the release notes. - Keep the style consistent with existing entries as much as possible: - each change should be documented by a short, one-sentence summary - and optionally a description where it's explained in more detail --> + Keep the style consistent with existing entries as much as possible. + + Each change should be documented by a short, one-sentence one-line su= mmary. + The summary should not contain any formatting tags. + + Optionally use a description where the change can be explained in more + detail. The description may contain a tag for switching to + non-proportional font. No other tags are allowed. + + Each tag is required to contain at least one
tag = and + each
tag is required to contain at least one tag. + + Lines should be kept under 80 columns, and should not exceed 100 colu= mns. + --> @@ -355,7 +366,7 @@ - nss: Introduce libvirt_guest + nss: Introduce libvirt_guest New libvirt_guest nss module that translates libvirt @@ -615,7 +626,7 @@ The new libssh transport allows one to connect to a running libvirtd via SSH, using the libssh library; for example: - qemu+libssh://server/system. + qemu+libssh://server/system. @@ -629,17 +640,22 @@ - qemu: Users can now enable debug logging for native gluster - volumes in qemu using the "gluster_debug_level" option in qemu.c= onf + Allow debugging of gluster volumes in qemu + + Users can now enable debug logging for native gluster + volumes in qemu using the "gluster_debug_level" option in qemu.c= onf + - memory hotplug: Slot numbers for memory devices are now - automatically allocated and thus persistent. In addition slot nu= mbers - can be specified without providing a base address, which simplif= ies - user configuration + Pre-allocate memory slots for memory hotplug + + Slot numbers for memory devices are now automatically allocated = and + thus persistent. In addition slot numbers can be specified witho= ut + providing a base address, which simplifies user configuration + @@ -669,8 +685,7 @@ - virsh: Add support for passing an alternative persistent XML - to migrate command + virsh: Add support for passing an alternative persistent XML to = migrate command --=20 2.12.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 19 09:00:02 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.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 1490702300665192.0052620274248; Tue, 28 Mar 2017 04:58:20 -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 0C5719D41B; Tue, 28 Mar 2017 11:58:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D35E08FB09; Tue, 28 Mar 2017 11:58:17 +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 81E314E9BD; Tue, 28 Mar 2017 11:58:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2SBw6uE027411 for ; Tue, 28 Mar 2017 07:58:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9073817DE5; Tue, 28 Mar 2017 11:58:06 +0000 (UTC) Received: from angien.brq.redhat.com (dhcp129-47.brq.redhat.com [10.34.129.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id E219F7F969; Tue, 28 Mar 2017 11:58:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0C5719D41B 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 0C5719D41B From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 28 Mar 2017 13:58:58 +0200 Message-Id: <535a71c2bb9ef13480e397e42a29cb9ef91fb69e.1490702145.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 3/4] schema: Introduce schema for the news.xml file 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.39]); Tue, 28 Mar 2017 11:58:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Since this file gets changed (and broken) rather often, introduce a schema file so that the test suite can validate it. --- docs/news.xml | 2 ++ docs/schemas/news.rng | 73 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ tests/virschematest.c | 2 ++ 3 files changed, 77 insertions(+) create mode 100644 docs/schemas/news.rng diff --git a/docs/news.xml b/docs/news.xml index 024b659e8..c2a2917c1 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -18,6 +18,8 @@ each
tag is required to contain at least one tag. Lines should be kept under 80 columns, and should not exceed 100 colu= mns. + + This file is validated against docs/news.rng schema. --> diff --git a/docs/schemas/news.rng b/docs/schemas/news.rng new file mode 100644 index 000000000..94a6870c1 --- /dev/null +++ b/docs/schemas/news.rng @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + v[0-9]+\.[0-9]+\.[0-9]+ + + + + + [0-9]{4}-[0-9]{2}-[0-9]{2}|unreleased + + + + + + + + + + + + + + + + + + + + + + + + + \n[^\n]+\n + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/virschematest.c b/tests/virschematest.c index beefabc96..e0e5872db 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -237,6 +237,8 @@ mymain(void) DO_TEST("storagevol.rng", "storagevolxml2xmlin", "storagevolxml2xmlout= ", "storagevolschemadata"); + DO_TEST_FILE("news.rng", "../docs/news.xml"); + return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } --=20 2.12.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 19 09:00:02 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.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 1490702303493714.0419555924685; Tue, 28 Mar 2017 04:58:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A8F1481227; Tue, 28 Mar 2017 11:58:21 +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 72E9790A4A; Tue, 28 Mar 2017 11:58:21 +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 19F8418523C7; Tue, 28 Mar 2017 11:58:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2SBw7h7027420 for ; Tue, 28 Mar 2017 07:58:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8E3647F965; Tue, 28 Mar 2017 11:58:07 +0000 (UTC) Received: from angien.brq.redhat.com (dhcp129-47.brq.redhat.com [10.34.129.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF66F7F958; Tue, 28 Mar 2017 11:58:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A8F1481227 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.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 A8F1481227 From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 28 Mar 2017 13:58:59 +0200 Message-Id: <447ccb9c2aa6d7148f0c0ff9ed63d9359cadb2ea.1490702145.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 4/4] news: Add template for a section 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 28 Mar 2017 11:58:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" After the release it's necessary to add a new section for the upcomming release. Add a template so that it does not have to be compiled over and over again. --- docs/news.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index c2a2917c1..1ebe0eec3 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -20,6 +20,27 @@ Lines should be kept under 80 columns, and should not exceed 100 colu= mns. This file is validated against docs/news.rng schema. + + Use the following template to add a new release section after the rel= ease: + + +
+ + + +
+
+ + + +
+
+ + + +
+ + --> --=20 2.12.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list