From nobody Wed Apr 24 06:33:41 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 1490707627860920.2513362225585; Tue, 28 Mar 2017 06:27:07 -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 30B027AEB6; Tue, 28 Mar 2017 13:27:06 +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 01CD753C74; Tue, 28 Mar 2017 13:27:06 +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 A10FA18523C8; Tue, 28 Mar 2017 13:27:05 +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 v2SDMDLO006631 for ; Tue, 28 Mar 2017 09:22:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 44A1B18B5F; Tue, 28 Mar 2017 13:22:13 +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 C06B118B4B for ; Tue, 28 Mar 2017 13:22:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 30B027AEB6 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 30B027AEB6 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 28 Mar 2017 15:22:07 +0200 Message-Id: <041dd8a34f3c775090e4434eb6c18453c25f8b17.1490707302.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 1/2] schema: do not require name for certain pool types 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 13:27:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Pool types that have the VIR_STORAGE_POOL_SOURCE_NAME flag set allow omitting the element and instead fill out the pool name from the element. Relax the schema to make optional for these pool. Expressing that at least one of these is required is out of scope of the schema.~ --- docs/schemas/storagepool.rng | 27 +++++++++++++++++-= ---- tests/storagepoolxml2xmlin/pool-logical-noname.xml | 18 +++++++++++++++ 2 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-logical-noname.xml diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 6219ce5..8386f29 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -70,7 +70,7 @@ logical - + @@ -132,7 +132,7 @@ rbd - + @@ -143,7 +143,7 @@ sheepdog - + @@ -154,7 +154,7 @@ gluster - + @@ -165,7 +165,7 @@ zfs - + @@ -179,7 +179,7 @@ vstorage - + @@ -205,6 +205,21 @@ =20 + + + + + + + + + + + + + + + diff --git a/tests/storagepoolxml2xmlin/pool-logical-noname.xml b/tests/sto= ragepoolxml2xmlin/pool-logical-noname.xml new file mode 100644 index 0000000..ad3f88d --- /dev/null +++ b/tests/storagepoolxml2xmlin/pool-logical-noname.xml @@ -0,0 +1,18 @@ + + 1c13165a-d0f4-3aee-b447-30fb38789091 + 99891544064 + 99220455424 + 671088640 + + zily + + + + /dev/zily + + 0700 + 0 + 0 + + + --=20 2.10.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed Apr 24 06:33:41 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 14907075876741004.2426319666785; Tue, 28 Mar 2017 06:26:27 -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 2826B42BD5; Tue, 28 Mar 2017 13:26:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EC2BCA68EE; Tue, 28 Mar 2017 13:26:25 +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 9A5905EC63; Tue, 28 Mar 2017 13:26:25 +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 v2SDMEIa006639 for ; Tue, 28 Mar 2017 09:22:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 16FF419636; Tue, 28 Mar 2017 13:22:14 +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 93A5F18B4B for ; Tue, 28 Mar 2017 13:22:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2826B42BD5 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 2826B42BD5 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 28 Mar 2017 15:22:08 +0200 Message-Id: <11b5eaecceeac0a4f1c3003b9ca771b3b9a5159d.1490707302.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 2/2] conf: do not steal pointers from the pool source 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.30]); Tue, 28 Mar 2017 13:26:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Since commit fcbbb28 we steal the pointer to the storage pool source name if there was no pool name specified. Properly duplicate the string to avoid freeing it twice. https://bugzilla.redhat.com/show_bug.cgi?id=3D1436400 --- src/conf/storage_conf.c | 5 +++-- tests/storagepoolxml2xmlout/pool-logical-noname.xml | 19 +++++++++++++++++= ++ tests/storagepoolxml2xmltest.c | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 tests/storagepoolxml2xmlout/pool-logical-noname.xml diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 585ca71..fe0f0bc 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -710,8 +710,9 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) =20 ret->name =3D virXPathString("string(./name)", ctxt); if (ret->name =3D=3D NULL && - options->flags & VIR_STORAGE_POOL_SOURCE_NAME) - ret->name =3D ret->source.name; + options->flags & VIR_STORAGE_POOL_SOURCE_NAME && + VIR_STRDUP(ret->name, ret->source.name) < 0) + goto error; if (ret->name =3D=3D NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing pool source name element")); diff --git a/tests/storagepoolxml2xmlout/pool-logical-noname.xml b/tests/st= oragepoolxml2xmlout/pool-logical-noname.xml new file mode 100644 index 0000000..a5e0ead --- /dev/null +++ b/tests/storagepoolxml2xmlout/pool-logical-noname.xml @@ -0,0 +1,19 @@ + + zily + 1c13165a-d0f4-3aee-b447-30fb38789091 + 0 + 0 + 0 + + zily + + + + /dev/zily + + 0700 + 0 + 0 + + + diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 79bdc26..355871c 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -79,6 +79,7 @@ mymain(void) DO_TEST("pool-logical"); DO_TEST("pool-logical-nopath"); DO_TEST("pool-logical-create"); + DO_TEST("pool-logical-noname"); DO_TEST("pool-disk"); DO_TEST("pool-disk-device-nopartsep"); DO_TEST("pool-iscsi"); --=20 2.10.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list