From nobody Sat Apr 27 19:55:29 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 1502890748672331.9088915802856; Wed, 16 Aug 2017 06:39:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E9825432A4; Wed, 16 Aug 2017 13:39:06 +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 6E9E068D2F; Wed, 16 Aug 2017 13:39: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 C29803FACE; Wed, 16 Aug 2017 13:39:05 +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 v7GDd42F010442 for ; Wed, 16 Aug 2017 09:39:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4AFD165EA8; Wed, 16 Aug 2017 13:39:04 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-181.phx2.redhat.com [10.3.116.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0246867CE3 for ; Wed, 16 Aug 2017 13:39:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E9825432A4 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=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: John Ferlan To: libvir-list@redhat.com Date: Wed, 16 Aug 2017 09:38:57 -0400 Message-Id: <20170816133900.28745-2-jferlan@redhat.com> In-Reply-To: <20170816133900.28745-1-jferlan@redhat.com> References: <20170816133900.28745-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/4] nodedev: Alter @aclfilter to just @filter 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 16 Aug 2017 13:39:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rename the variable, recent review requested just use of @filter, so be consistent throughout. Signed-off-by: John Ferlan --- src/conf/virnodedeviceobj.c | 28 ++++++++++++++-------------- src/conf/virnodedeviceobj.h | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 3ab93a3..b0dcee1 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -732,7 +732,7 @@ virNodeDeviceCapMatch(virNodeDeviceObjPtr obj, =20 struct virNodeDeviceCountData { virConnectPtr conn; - virNodeDeviceObjListFilter aclfilter; + virNodeDeviceObjListFilter filter; const char *matchstr; int count; }; @@ -745,11 +745,11 @@ virNodeDeviceObjListNumOfDevicesCallback(void *payloa= d, virNodeDeviceObjPtr obj =3D payload; virNodeDeviceDefPtr def; struct virNodeDeviceCountData *data =3D opaque; - virNodeDeviceObjListFilter aclfilter =3D data->aclfilter; + virNodeDeviceObjListFilter filter =3D data->filter; =20 virObjectLock(obj); def =3D obj->def; - if ((!aclfilter || aclfilter(data->conn, def)) && + if ((!filter || filter(data->conn, def)) && (!data->matchstr || virNodeDeviceObjHasCap(obj, data->matchstr))) data->count++; =20 @@ -762,10 +762,10 @@ int virNodeDeviceObjListNumOfDevices(virNodeDeviceObjListPtr devs, virConnectPtr conn, const char *cap, - virNodeDeviceObjListFilter aclfilter) + virNodeDeviceObjListFilter filter) { struct virNodeDeviceCountData data =3D { - .conn =3D conn, .aclfilter =3D aclfilter, .matchstr =3D cap, .coun= t =3D 0 }; + .conn =3D conn, .filter =3D filter, .matchstr =3D cap, .count =3D = 0 }; =20 virObjectLock(devs); virHashForEach(devs->objs, virNodeDeviceObjListNumOfDevicesCallback, &= data); @@ -777,7 +777,7 @@ virNodeDeviceObjListNumOfDevices(virNodeDeviceObjListPt= r devs, =20 struct virNodeDeviceGetNamesData { virConnectPtr conn; - virNodeDeviceObjListFilter aclfilter; + virNodeDeviceObjListFilter filter; const char *matchstr; int nnames; char **names; @@ -793,7 +793,7 @@ virNodeDeviceObjListGetNamesCallback(void *payload, virNodeDeviceObjPtr obj =3D payload; virNodeDeviceDefPtr def; struct virNodeDeviceGetNamesData *data =3D opaque; - virNodeDeviceObjListFilter aclfilter =3D data->aclfilter; + virNodeDeviceObjListFilter filter =3D data->filter; =20 if (data->error) return 0; @@ -801,7 +801,7 @@ virNodeDeviceObjListGetNamesCallback(void *payload, virObjectLock(obj); def =3D obj->def; =20 - if ((!aclfilter || aclfilter(data->conn, def)) && + if ((!filter || filter(data->conn, def)) && (!data->matchstr || virNodeDeviceObjHasCap(obj, data->matchstr))) { if (VIR_STRDUP(data->names[data->nnames], def->name) < 0) { data->error =3D true; @@ -819,13 +819,13 @@ virNodeDeviceObjListGetNamesCallback(void *payload, int virNodeDeviceObjListGetNames(virNodeDeviceObjListPtr devs, virConnectPtr conn, - virNodeDeviceObjListFilter aclfilter, + virNodeDeviceObjListFilter filter, const char *cap, char **const names, int maxnames) { struct virNodeDeviceGetNamesData data =3D { - .conn =3D conn, .aclfilter =3D aclfilter, .matchstr =3D cap, .name= s =3D names, + .conn =3D conn, .filter =3D filter, .matchstr =3D cap, .names =3D = names, .nnames =3D 0, .maxnames =3D maxnames, .error =3D false }; =20 virObjectLock(devs); @@ -878,7 +878,7 @@ virNodeDeviceMatch(virNodeDeviceObjPtr obj, =20 struct virNodeDeviceObjListExportData { virConnectPtr conn; - virNodeDeviceObjListFilter aclfilter; + virNodeDeviceObjListFilter filter; unsigned int flags; virNodeDevicePtr *devices; int ndevices; @@ -901,7 +901,7 @@ virNodeDeviceObjListExportCallback(void *payload, virObjectLock(obj); def =3D obj->def; =20 - if ((!data->aclfilter || data->aclfilter(data->conn, def)) && + if ((!data->filter || data->filter(data->conn, def)) && virNodeDeviceMatch(obj, data->flags)) { if (data->devices) { if (!(device =3D virGetNodeDevice(data->conn, def->name)) || @@ -925,11 +925,11 @@ int virNodeDeviceObjListExport(virConnectPtr conn, virNodeDeviceObjListPtr devs, virNodeDevicePtr **devices, - virNodeDeviceObjListFilter aclfilter, + virNodeDeviceObjListFilter filter, unsigned int flags) { struct virNodeDeviceObjListExportData data =3D { - .conn =3D conn, .aclfilter =3D aclfilter, .flags =3D flags, + .conn =3D conn, .filter =3D filter, .flags =3D flags, .devices =3D NULL, .ndevices =3D 0, .error =3D false }; =20 virObjectLock(devs); diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h index 06f2e9e..63917eb 100644 --- a/src/conf/virnodedeviceobj.h +++ b/src/conf/virnodedeviceobj.h @@ -91,12 +91,12 @@ int virNodeDeviceObjListNumOfDevices(virNodeDeviceObjListPtr devs, virConnectPtr conn, const char *cap, - virNodeDeviceObjListFilter aclfilter); + virNodeDeviceObjListFilter filter); =20 int virNodeDeviceObjListGetNames(virNodeDeviceObjListPtr devs, virConnectPtr conn, - virNodeDeviceObjListFilter aclfilter, + virNodeDeviceObjListFilter filter, const char *cap, char **const names, int maxnames); @@ -105,7 +105,7 @@ int virNodeDeviceObjListExport(virConnectPtr conn, virNodeDeviceObjListPtr devobjs, virNodeDevicePtr **devices, - virNodeDeviceObjListFilter aclfilter, + virNodeDeviceObjListFilter filter, unsigned int flags); =20 #endif /* __VIRNODEDEVICEOBJ_H__ */ --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 19:55:29 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 1502890748962497.2075475313321; Wed, 16 Aug 2017 06:39:08 -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 40872C05A1B6; Wed, 16 Aug 2017 13:39:07 +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 1B6DC6060C; Wed, 16 Aug 2017 13:39:07 +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 68B331800C8A; Wed, 16 Aug 2017 13:39:06 +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 v7GDd4Jj010456 for ; Wed, 16 Aug 2017 09:39:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id E92AE65EA8; Wed, 16 Aug 2017 13:39:04 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-181.phx2.redhat.com [10.3.116.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD69E68D4F for ; Wed, 16 Aug 2017 13:39:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 40872C05A1B6 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: John Ferlan To: libvir-list@redhat.com Date: Wed, 16 Aug 2017 09:38:58 -0400 Message-Id: <20170816133900.28745-3-jferlan@redhat.com> In-Reply-To: <20170816133900.28745-1-jferlan@redhat.com> References: <20170816133900.28745-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] nwfilter: Alter @aclfilter to just @filter 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]); Wed, 16 Aug 2017 13:39:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rename the variable, recent review requested just use of @filter, so be consistent throughout. NB: Also change the virNWFilterPtr to be @nwfilter to not conflict with the renamed variable. Signed-off-by: John Ferlan --- src/conf/virnwfilterobj.c | 18 +++++++++--------- src/conf/virnwfilterobj.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 93072be..408e575 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -398,7 +398,7 @@ virNWFilterObjListAssignDef(virNWFilterObjListPtr nwfil= ters, int virNWFilterObjListNumOfNWFilters(virNWFilterObjListPtr nwfilters, virConnectPtr conn, - virNWFilterObjListFilter aclfilter) + virNWFilterObjListFilter filter) { size_t i; int nfilters =3D 0; @@ -406,7 +406,7 @@ virNWFilterObjListNumOfNWFilters(virNWFilterObjListPtr = nwfilters, for (i =3D 0; i < nwfilters->count; i++) { virNWFilterObjPtr obj =3D nwfilters->objs[i]; virNWFilterObjLock(obj); - if (!aclfilter || aclfilter(conn, obj->def)) + if (!filter || filter(conn, obj->def)) nfilters++; virNWFilterObjUnlock(obj); } @@ -418,7 +418,7 @@ virNWFilterObjListNumOfNWFilters(virNWFilterObjListPtr = nwfilters, int virNWFilterObjListGetNames(virNWFilterObjListPtr nwfilters, virConnectPtr conn, - virNWFilterObjListFilter aclfilter, + virNWFilterObjListFilter filter, char **const names, int maxnames) { @@ -430,7 +430,7 @@ virNWFilterObjListGetNames(virNWFilterObjListPtr nwfilt= ers, virNWFilterObjPtr obj =3D nwfilters->objs[i]; virNWFilterObjLock(obj); def =3D obj->def; - if (!aclfilter || aclfilter(conn, def)) { + if (!filter || filter(conn, def)) { if (VIR_STRDUP(names[nnames], def->name) < 0) { virNWFilterObjUnlock(obj); goto failure; @@ -454,11 +454,11 @@ int virNWFilterObjListExport(virConnectPtr conn, virNWFilterObjListPtr nwfilters, virNWFilterPtr **filters, - virNWFilterObjListFilter aclfilter) + virNWFilterObjListFilter filter) { virNWFilterPtr *tmp_filters =3D NULL; int nfilters =3D 0; - virNWFilterPtr filter =3D NULL; + virNWFilterPtr nwfilter =3D NULL; virNWFilterObjPtr obj =3D NULL; virNWFilterDefPtr def; size_t i; @@ -476,12 +476,12 @@ virNWFilterObjListExport(virConnectPtr conn, obj =3D nwfilters->objs[i]; virNWFilterObjLock(obj); def =3D obj->def; - if (!aclfilter || aclfilter(conn, def)) { - if (!(filter =3D virGetNWFilter(conn, def->name, def->uuid))) { + if (!filter || filter(conn, def)) { + if (!(nwfilter =3D virGetNWFilter(conn, def->name, def->uuid))= ) { virNWFilterObjUnlock(obj); goto cleanup; } - tmp_filters[nfilters++] =3D filter; + tmp_filters[nfilters++] =3D nwfilter; } virNWFilterObjUnlock(obj); } diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index 509e8dc..8e79518 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -86,12 +86,12 @@ typedef bool int virNWFilterObjListNumOfNWFilters(virNWFilterObjListPtr nwfilters, virConnectPtr conn, - virNWFilterObjListFilter aclfilter); + virNWFilterObjListFilter filter); =20 int virNWFilterObjListGetNames(virNWFilterObjListPtr nwfilters, virConnectPtr conn, - virNWFilterObjListFilter aclfilter, + virNWFilterObjListFilter filter, char **const names, int maxnames); =20 @@ -99,7 +99,7 @@ int virNWFilterObjListExport(virConnectPtr conn, virNWFilterObjListPtr nwfilters, virNWFilterPtr **filters, - virNWFilterObjListFilter aclfilter); + virNWFilterObjListFilter filter); =20 int virNWFilterObjListLoadAllConfigs(virNWFilterObjListPtr nwfilters, --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 19:55:29 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 1502890757792680.7196674198537; Wed, 16 Aug 2017 06:39:17 -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 0D69DC004782; Wed, 16 Aug 2017 13:39:15 +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 CDAA87DE10; Wed, 16 Aug 2017 13:39: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 8CDE93FAD2; Wed, 16 Aug 2017 13:39:14 +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 v7GDd5gF010461 for ; Wed, 16 Aug 2017 09:39:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4C92367CE3; Wed, 16 Aug 2017 13:39:05 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-181.phx2.redhat.com [10.3.116.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12D1F65EA8 for ; Wed, 16 Aug 2017 13:39:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0D69DC004782 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: John Ferlan To: libvir-list@redhat.com Date: Wed, 16 Aug 2017 09:38:59 -0400 Message-Id: <20170816133900.28745-4-jferlan@redhat.com> In-Reply-To: <20170816133900.28745-1-jferlan@redhat.com> References: <20170816133900.28745-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] secret: Alter @aclfilter to just @filter 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.32]); Wed, 16 Aug 2017 13:39:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rename the variable, recent review requested just use of @filter, so be consistent throughout. Signed-off-by: John Ferlan --- src/conf/virsecretobj.c | 24 ++++++++++++------------ src/conf/virsecretobj.h | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index aa994ba..4dca152 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -412,7 +412,7 @@ virSecretObjListAdd(virSecretObjListPtr secrets, =20 struct virSecretCountData { virConnectPtr conn; - virSecretObjListACLFilter aclfilter; + virSecretObjListACLFilter filter; int count; }; =20 @@ -428,7 +428,7 @@ virSecretObjListNumOfSecretsCallback(void *payload, virObjectLock(obj); def =3D obj->def; =20 - if (data->aclfilter && !data->aclfilter(data->conn, def)) + if (data->filter && !data->filter(data->conn, def)) goto cleanup; =20 data->count++; @@ -441,7 +441,7 @@ virSecretObjListNumOfSecretsCallback(void *payload, =20 struct virSecretListData { virConnectPtr conn; - virSecretObjListACLFilter aclfilter; + virSecretObjListACLFilter filter; int nuuids; char **uuids; int maxuuids; @@ -467,7 +467,7 @@ virSecretObjListGetUUIDsCallback(void *payload, virObjectLock(obj); def =3D obj->def; =20 - if (data->aclfilter && !data->aclfilter(data->conn, def)) + if (data->filter && !data->filter(data->conn, def)) goto cleanup; =20 if (data->uuids) { @@ -490,11 +490,11 @@ virSecretObjListGetUUIDsCallback(void *payload, =20 int virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn) { struct virSecretCountData data =3D { - .conn =3D conn, .aclfilter =3D aclfilter, .count =3D 0 }; + .conn =3D conn, .filter =3D filter, .count =3D 0 }; =20 virObjectLock(secrets); virHashForEach(secrets->objs, virSecretObjListNumOfSecretsCallback, &d= ata); @@ -535,7 +535,7 @@ virSecretObjMatchFlags(virSecretObjPtr obj, struct virSecretObjListData { virConnectPtr conn; virSecretPtr *secrets; - virSecretObjListACLFilter aclfilter; + virSecretObjListACLFilter filter; unsigned int flags; int nsecrets; bool error; @@ -557,7 +557,7 @@ virSecretObjListExportCallback(void *payload, virObjectLock(obj); def =3D obj->def; =20 - if (data->aclfilter && !data->aclfilter(data->conn, def)) + if (data->filter && !data->filter(data->conn, def)) goto cleanup; =20 if (!virSecretObjMatchFlags(obj, data->flags)) @@ -587,12 +587,12 @@ int virSecretObjListExport(virConnectPtr conn, virSecretObjListPtr secretobjs, virSecretPtr **secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, unsigned int flags) { struct virSecretObjListData data =3D { .conn =3D conn, .secrets =3D NULL, - .aclfilter =3D aclfilter, .flags =3D flags, + .filter =3D filter, .flags =3D flags, .nsecrets =3D 0, .error =3D false }; =20 virObjectLock(secretobjs); @@ -626,11 +626,11 @@ int virSecretObjListGetUUIDs(virSecretObjListPtr secrets, char **uuids, int maxuuids, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn) { struct virSecretListData data =3D { - .conn =3D conn, .aclfilter =3D aclfilter, .uuids =3D uuids, .nuuid= s =3D 0, + .conn =3D conn, .filter =3D filter, .uuids =3D uuids, .nuuids =3D = 0, .maxuuids =3D maxuuids, .error =3D false }; =20 virObjectLock(secrets); diff --git a/src/conf/virsecretobj.h b/src/conf/virsecretobj.h index 0196813..d412ee6 100644 --- a/src/conf/virsecretobj.h +++ b/src/conf/virsecretobj.h @@ -63,21 +63,21 @@ typedef bool =20 int virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn); =20 int virSecretObjListExport(virConnectPtr conn, virSecretObjListPtr secretobjs, virSecretPtr **secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, unsigned int flags); =20 int virSecretObjListGetUUIDs(virSecretObjListPtr secrets, char **uuids, int maxuuids, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn); =20 int --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 19:55:29 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 1502890756986686.8182014689619; Wed, 16 Aug 2017 06:39:16 -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 065317CDF0; Wed, 16 Aug 2017 13:39:15 +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 D6BC46063E; Wed, 16 Aug 2017 13:39: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 967A21806106; Wed, 16 Aug 2017 13:39:14 +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 v7GDd5AU010467 for ; Wed, 16 Aug 2017 09:39:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id D083C67CE3; Wed, 16 Aug 2017 13:39:05 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-181.phx2.redhat.com [10.3.116.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99CA565EA8 for ; Wed, 16 Aug 2017 13:39:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 065317CDF0 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: John Ferlan To: libvir-list@redhat.com Date: Wed, 16 Aug 2017 09:39:00 -0400 Message-Id: <20170816133900.28745-5-jferlan@redhat.com> In-Reply-To: <20170816133900.28745-1-jferlan@redhat.com> References: <20170816133900.28745-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] storage: Alter @aclfilter to just @filter 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.28]); Wed, 16 Aug 2017 13:39:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rename the variable, recent review requested just use of @filter, so be consistent throughout. Signed-off-by: John Ferlan --- src/conf/virstorageobj.c | 20 ++++++++++---------- src/conf/virstorageobj.h | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 23346f3..e83044b 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -198,7 +198,7 @@ virStorageVolDefFindByName(virStoragePoolObjPtr obj, int virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, virConnectPtr conn, - virStoragePoolVolumeACLFilter aclfilter) + virStoragePoolVolumeACLFilter filter) { virStoragePoolDefPtr pooldef =3D obj->def; virStorageVolDefListPtr volumes =3D &obj->volumes; @@ -207,7 +207,7 @@ virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, =20 for (i =3D 0; i < volumes->count; i++) { virStorageVolDefPtr def =3D volumes->objs[i]; - if (aclfilter && !aclfilter(conn, pooldef, def)) + if (filter && !filter(conn, pooldef, def)) continue; nvolumes++; } @@ -219,7 +219,7 @@ virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, int virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj, virConnectPtr conn, - virStoragePoolVolumeACLFilter aclfilter, + virStoragePoolVolumeACLFilter filter, char **const names, int maxnames) { @@ -230,7 +230,7 @@ virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr ob= j, =20 for (i =3D 0; i < volumes->count && nnames < maxnames; i++) { virStorageVolDefPtr def =3D volumes->objs[i]; - if (aclfilter && !aclfilter(conn, pooldef, def)) + if (filter && !filter(conn, pooldef, def)) continue; if (VIR_STRDUP(names[nnames], def->name) < 0) goto failure; @@ -251,7 +251,7 @@ int virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolObjPtr obj, virStorageVolPtr **vols, - virStoragePoolVolumeACLFilter aclfilter) + virStoragePoolVolumeACLFilter filter) { virStoragePoolDefPtr pooldef =3D obj->def; virStorageVolDefListPtr volumes =3D &obj->volumes; @@ -272,7 +272,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, =20 for (i =3D 0; i < volumes->count; i++) { virStorageVolDefPtr def =3D volumes->objs[i]; - if (aclfilter && !aclfilter(conn, pooldef, def)) + if (filter && !filter(conn, pooldef, def)) continue; if (!(vol =3D virGetStorageVol(conn, pooldef->name, def->name, def= ->key, NULL, NULL))) @@ -562,7 +562,7 @@ int virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilte= r) + virStoragePoolObjListACLFilter filter) { int npools =3D 0; size_t i; @@ -570,7 +570,7 @@ virStoragePoolObjNumOfStoragePools(virStoragePoolObjLis= tPtr pools, for (i =3D 0; i < pools->count; i++) { virStoragePoolObjPtr obj =3D pools->objs[i]; virStoragePoolObjLock(obj); - if (!aclfilter || aclfilter(conn, obj->def)) { + if (!filter || filter(conn, obj->def)) { if (wantActive =3D=3D virStoragePoolObjIsActive(obj)) npools++; } @@ -585,7 +585,7 @@ int virStoragePoolObjGetNames(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilter, + virStoragePoolObjListACLFilter filter, char **const names, int maxnames) { @@ -595,7 +595,7 @@ virStoragePoolObjGetNames(virStoragePoolObjListPtr pool= s, for (i =3D 0; i < pools->count && nnames < maxnames; i++) { virStoragePoolObjPtr obj =3D pools->objs[i]; virStoragePoolObjLock(obj); - if (!aclfilter || aclfilter(conn, obj->def)) { + if (!filter || filter(conn, obj->def)) { if (wantActive =3D=3D virStoragePoolObjIsActive(obj)) { if (VIR_STRDUP(names[nnames], obj->def->name) < 0) { virStoragePoolObjUnlock(obj); diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index 5a61b2a..ac51b5f 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -116,12 +116,12 @@ typedef bool int virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, virConnectPtr conn, - virStoragePoolVolumeACLFilter aclfilter); + virStoragePoolVolumeACLFilter filter); =20 int virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj, virConnectPtr conn, - virStoragePoolVolumeACLFilter aclfilter, + virStoragePoolVolumeACLFilter filter, char **const names, int maxnames); =20 @@ -129,7 +129,7 @@ int virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolObjPtr obj, virStorageVolPtr **vols, - virStoragePoolVolumeACLFilter aclfilter); + virStoragePoolVolumeACLFilter filter); =20 virStoragePoolObjPtr virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, @@ -150,13 +150,13 @@ int virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilte= r); + virStoragePoolObjListACLFilter filter); =20 int virStoragePoolObjGetNames(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilter, + virStoragePoolObjListACLFilter filter, char **const names, int maxnames); =20 --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list