From nobody Thu May 15 23:13:30 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 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