From nobody Wed Feb 11 07:09:20 2026 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 1493056847596157.5847397284881; Mon, 24 Apr 2017 11:00:47 -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 1216414B0F9; Mon, 24 Apr 2017 18:00:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D85B818A7B; Mon, 24 Apr 2017 18:00:44 +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 770495EC6A; Mon, 24 Apr 2017 18:00:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v3OI0biW004728 for ; Mon, 24 Apr 2017 14:00:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1B82777ED5; Mon, 24 Apr 2017 18:00:37 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-126-74.rdu2.redhat.com [10.10.126.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id D237B17A7B for ; Mon, 24 Apr 2017 18:00:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1216414B0F9 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 1216414B0F9 From: John Ferlan To: libvir-list@redhat.com Date: Mon, 24 Apr 2017 14:00:16 -0400 Message-Id: <20170424180023.4695-8-jferlan@redhat.com> In-Reply-To: <20170424180023.4695-1-jferlan@redhat.com> References: <20170424180023.4695-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/14] secret: Move virSecretObjListGetUUIDs 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]); Mon, 24 Apr 2017 18:00:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move code closer to usage. Signed-off-by: John Ferlan --- src/conf/virsecretobj.c | 62 ++++++++++++++++++++++++---------------------= ---- src/conf/virsecretobj.h | 14 +++++------ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 413955d..998f815 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -483,6 +483,37 @@ virSecretObjListNumOfSecrets(virSecretObjListPtr secre= ts, } =20 =20 +int +virSecretObjListGetUUIDs(virSecretObjListPtr secrets, + char **uuids, + int nuuids, + virSecretObjListACLFilter filter, + virConnectPtr conn) +{ + int ret =3D -1; + + struct virSecretObjListGetHelperData data =3D { + .conn =3D conn, .filter =3D filter, .got =3D 0, + .uuids =3D uuids, .nuuids =3D nuuids, .error =3D false }; + + virObjectLock(secrets); + virHashForEach(secrets->objs, virSecretObjListGetHelper, &data); + virObjectUnlock(secrets); + + if (data.error) + goto cleanup; + + ret =3D data.got; + + cleanup: + if (ret < 0) { + while (data.got) + VIR_FREE(data.uuids[--data.got]); + } + return ret; +} + + #define MATCH(FLAG) (flags & (FLAG)) static bool virSecretObjMatchFlags(virSecretObjPtr obj, @@ -605,37 +636,6 @@ virSecretObjListExport(virConnectPtr conn, =20 =20 int -virSecretObjListGetUUIDs(virSecretObjListPtr secrets, - char **uuids, - int nuuids, - virSecretObjListACLFilter filter, - virConnectPtr conn) -{ - int ret =3D -1; - - struct virSecretObjListGetHelperData data =3D { - .conn =3D conn, .filter =3D filter, .got =3D 0, - .uuids =3D uuids, .nuuids =3D nuuids, .error =3D false }; - - virObjectLock(secrets); - virHashForEach(secrets->objs, virSecretObjListGetHelper, &data); - virObjectUnlock(secrets); - - if (data.error) - goto cleanup; - - ret =3D data.got; - - cleanup: - if (ret < 0) { - while (data.got) - VIR_FREE(data.uuids[--data.got]); - } - return ret; -} - - -int virSecretObjDeleteConfig(virSecretObjPtr obj) { virSecretDefPtr def =3D obj->def; diff --git a/src/conf/virsecretobj.h b/src/conf/virsecretobj.h index 8038faa..82915d0 100644 --- a/src/conf/virsecretobj.h +++ b/src/conf/virsecretobj.h @@ -67,13 +67,6 @@ virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, virConnectPtr conn); =20 int -virSecretObjListExport(virConnectPtr conn, - virSecretObjListPtr secretobjs, - virSecretPtr **secrets, - virSecretObjListACLFilter filter, - unsigned int flags); - -int virSecretObjListGetUUIDs(virSecretObjListPtr secrets, char **uuids, int nuuids, @@ -81,6 +74,13 @@ virSecretObjListGetUUIDs(virSecretObjListPtr secrets, virConnectPtr conn); =20 int +virSecretObjListExport(virConnectPtr conn, + virSecretObjListPtr secretobjs, + virSecretPtr **secrets, + virSecretObjListACLFilter filter, + unsigned int flags); + +int virSecretObjDeleteConfig(virSecretObjPtr obj); =20 void --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list