From nobody Wed May 14 12:03:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522271987928646.3936618916787; Wed, 28 Mar 2018 14:19:47 -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 6B192C04BE12; Wed, 28 Mar 2018 21:19:46 +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 5E0DB5D70A; Wed, 28 Mar 2018 21:19:45 +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 B65734CA9D; Wed, 28 Mar 2018 21:19:44 +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 w2SLJfRa000484 for ; Wed, 28 Mar 2018 17:19:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8EA8463143; Wed, 28 Mar 2018 21:19:41 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-116-109.phx2.redhat.com [10.3.116.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F7B563142 for ; Wed, 28 Mar 2018 21:19:41 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Wed, 28 Mar 2018 17:19:25 -0400 Message-Id: <20180328211933.8033-2-jferlan@redhat.com> In-Reply-To: <20180328211933.8033-1-jferlan@redhat.com> References: <20180328211933.8033-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 1/9] secret: Rework LoadAllConfigs 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.31]); Wed, 28 Mar 2018 21:19:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move the virSecretObjEndAPI into virSecretLoad and alter the processing in order to accomodate that. Signed-off-by: John Ferlan --- src/conf/virsecretobj.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 47e0b2896..4aaf47b5d 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -906,12 +906,13 @@ virSecretLoadValue(virSecretObjPtr obj) } =20 =20 -static virSecretObjPtr +static int virSecretLoad(virSecretObjListPtr secrets, const char *file, const char *path, const char *configDir) { + int ret =3D -1; virSecretDefPtr def =3D NULL; virSecretObjPtr obj =3D NULL; =20 @@ -927,13 +928,16 @@ virSecretLoad(virSecretObjListPtr secrets, =20 if (virSecretLoadValue(obj) < 0) { virSecretObjListRemove(secrets, obj); - virObjectUnref(obj); - obj =3D NULL; + virObjectLock(obj); + goto cleanup; } =20 + ret =3D 0; + cleanup: virSecretDefFree(def); - return obj; + virSecretObjEndAPI(&obj); + return ret; } =20 =20 @@ -952,7 +956,6 @@ virSecretLoadAllConfigs(virSecretObjListPtr secrets, * loop (if any). It's better to keep the secrets we managed to find.= */ while (virDirRead(dir, &de, NULL) > 0) { char *path; - virSecretObjPtr obj; =20 if (!virFileHasSuffix(de->d_name, ".xml")) continue; @@ -960,15 +963,10 @@ virSecretLoadAllConfigs(virSecretObjListPtr secrets, if (!(path =3D virFileBuildPath(configDir, de->d_name, NULL))) continue; =20 - if (!(obj =3D virSecretLoad(secrets, de->d_name, path, configDir))= ) { - VIR_ERROR(_("Error reading secret: %s"), - virGetLastErrorMessage()); - VIR_FREE(path); - continue; - } + if (virSecretLoad(secrets, de->d_name, path, configDir) < 0) + VIR_ERROR(_("Error reading secret: %s"), virGetLastErrorMessag= e()); =20 VIR_FREE(path); - virSecretObjEndAPI(&obj); } =20 VIR_DIR_CLOSE(dir); --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list