From nobody Fri May 3 13:59:43 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.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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1513601833138905.8647350105463; Mon, 18 Dec 2017 04:57:13 -0800 (PST) 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 8C453C0ABF48; Mon, 18 Dec 2017 12:57:11 +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 62DC7784B1; Mon, 18 Dec 2017 12:57:11 +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 29F011800BDF; Mon, 18 Dec 2017 12:57:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vBICuxg9011133 for ; Mon, 18 Dec 2017 07:56:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5794278409; Mon, 18 Dec 2017 12:56:59 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-72.phx2.redhat.com [10.3.116.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1ED4378401 for ; Mon, 18 Dec 2017 12:56:59 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Mon, 18 Dec 2017 07:56:52 -0500 Message-Id: <20171218125654.32257-2-jferlan@redhat.com> In-Reply-To: <20171218125654.32257-1-jferlan@redhat.com> References: <20171218125654.32257-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/3] conf: Need to unlock pools on object allocation failure 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.31]); Mon, 18 Dec 2017 12:57:12 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The RW pool could be left unlocked if allocation fails. Signed-off-by: John Ferlan Reviewed-by: Erik Skultety --- src/conf/virstorageobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 49fe24b28..19903b6c5 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -748,7 +748,7 @@ virStoragePoolObjAssignDef(virStoragePoolObjListPtr poo= ls, } =20 if (!(obj =3D virStoragePoolObjNew())) - return NULL; + goto error; =20 virUUIDFormat(def->uuid, uuidstr); if (virHashAddEntry(pools->objs, uuidstr, obj) < 0) --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 13:59:43 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.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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1513601835894691.8160593592436; Mon, 18 Dec 2017 04:57:15 -0800 (PST) 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 3489261471; Mon, 18 Dec 2017 12:57:14 +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 0E5AE7C801; Mon, 18 Dec 2017 12:57: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 CDEFE1801216; Mon, 18 Dec 2017 12:57:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vBICux0q011138 for ; Mon, 18 Dec 2017 07:56:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id B082D7C801; Mon, 18 Dec 2017 12:56:59 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-72.phx2.redhat.com [10.3.116.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79A707840E for ; Mon, 18 Dec 2017 12:56:59 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Mon, 18 Dec 2017 07:56:53 -0500 Message-Id: <20171218125654.32257-3-jferlan@redhat.com> In-Reply-To: <20171218125654.32257-1-jferlan@redhat.com> References: <20171218125654.32257-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/3] conf: Use bool for @check_active parameter 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.39]); Mon, 18 Dec 2017 12:57:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use a bool as that's how the variable is used in the function. Signed-off-by: John Ferlan Reviewed-by: Erik Skultety --- src/conf/virstorageobj.c | 2 +- src/conf/virstorageobj.h | 2 +- src/storage/storage_driver.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 19903b6c5..1eaa53423 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1133,7 +1133,7 @@ virStoragePoolObjGetNames(virStoragePoolObjListPtr po= ols, int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def, - unsigned int check_active) + bool check_active) { int ret =3D -1; virStoragePoolObjPtr obj =3D NULL; diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index 4f372386a..dd7001c4b 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -247,7 +247,7 @@ virStoragePoolObjRemove(virStoragePoolObjListPtr pools, int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def, - unsigned int check_active); + bool check_active); =20 int virStoragePoolObjSourceFindDuplicate(virConnectPtr conn, diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index f86087fb0..f590f6b9b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -656,7 +656,7 @@ storagePoolCreateXML(virConnectPtr conn, if (virStoragePoolCreateXMLEnsureACL(conn, newDef) < 0) goto cleanup; =20 - if (virStoragePoolObjIsDuplicate(driver->pools, newDef, 1) < 0) + if (virStoragePoolObjIsDuplicate(driver->pools, newDef, true) < 0) goto cleanup; =20 if (virStoragePoolObjSourceFindDuplicate(conn, driver->pools, newDef) = < 0) @@ -751,7 +751,7 @@ storagePoolDefineXML(virConnectPtr conn, if (virStoragePoolDefineXMLEnsureACL(conn, newDef) < 0) goto cleanup; =20 - if (virStoragePoolObjIsDuplicate(driver->pools, newDef, 0) < 0) + if (virStoragePoolObjIsDuplicate(driver->pools, newDef, false) < 0) goto cleanup; =20 if (virStoragePoolObjSourceFindDuplicate(conn, driver->pools, newDef) = < 0) --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 13:59:43 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.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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1513601825624343.0226057947648; Mon, 18 Dec 2017 04:57:05 -0800 (PST) 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 B8EDB780CD; Mon, 18 Dec 2017 12:57:03 +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 8125378401; Mon, 18 Dec 2017 12:57:03 +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 452164BB79; Mon, 18 Dec 2017 12:57:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vBICv28t011163 for ; Mon, 18 Dec 2017 07:57:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6893D7840E; Mon, 18 Dec 2017 12:57:02 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-72.phx2.redhat.com [10.3.116.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3192478409 for ; Mon, 18 Dec 2017 12:56:59 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Mon, 18 Dec 2017 07:56:54 -0500 Message-Id: <20171218125654.32257-4-jferlan@redhat.com> In-Reply-To: <20171218125654.32257-1-jferlan@redhat.com> References: <20171218125654.32257-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 3/3] test: Use virStoragePoolObjIsDuplicate for storage define/create 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.27]); Mon, 18 Dec 2017 12:57:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Avoid the chance that there could be a duplicate storage pool UUID or Name from the test driver storage pool define/create functions. Signed-off-by: John Ferlan Reviewed-by: Erik Skultety --- src/test/test_driver.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 8adc2167b..dc743b498 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4440,14 +4440,8 @@ testStoragePoolCreateXML(virConnectPtr conn, if (!(newDef =3D virStoragePoolDefParseString(xml))) goto cleanup; =20 - obj =3D virStoragePoolObjFindByUUID(privconn->pools, newDef->uuid); - if (!obj) - obj =3D virStoragePoolObjFindByName(privconn->pools, newDef->name); - if (obj) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("storage pool already exists")); + if (virStoragePoolObjIsDuplicate(privconn->pools, newDef, true) < 0) goto cleanup; - } =20 if (!(obj =3D virStoragePoolObjAssignDef(privconn->pools, newDef))) goto cleanup; @@ -4520,6 +4514,9 @@ testStoragePoolDefineXML(virConnectPtr conn, newDef->allocation =3D defaultPoolAlloc; newDef->available =3D defaultPoolCap - defaultPoolAlloc; =20 + if (virStoragePoolObjIsDuplicate(privconn->pools, newDef, false) < 0) + goto cleanup; + if (!(obj =3D virStoragePoolObjAssignDef(privconn->pools, newDef))) goto cleanup; newDef =3D NULL; --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list