From nobody Sat May 4 20:58:24 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532964292281472.3874277562354; Mon, 30 Jul 2018 08:24:52 -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 9A4F24E028; Mon, 30 Jul 2018 15:24:48 +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 265036E518; Mon, 30 Jul 2018 15:24:48 +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 12BE718037F0; Mon, 30 Jul 2018 15:24:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6UE851A013574 for ; Mon, 30 Jul 2018 10:08:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8238A7C52; Mon, 30 Jul 2018 14:08:05 +0000 (UTC) Received: from dhcp-17-130.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 636E176CC; Mon, 30 Jul 2018 14:08:05 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Mon, 30 Jul 2018 10:07:51 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Anya Harter Subject: [libvirt] [PATCH 1/3] conf: rename structs used by Export function 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.38]); Mon, 30 Jul 2018 15:24:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" to be the name of the Export function followed by Data ex. for virInterfaceObjListExport, the struct is named virInterfaceObjListExportData Signed-off-by: Anya Harter --- src/conf/virinterfaceobj.c | 6 +++--- src/conf/virnetworkobj.c | 6 +++--- src/conf/virsecretobj.c | 6 +++--- src/conf/virstorageobj.c | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index b0c4ca15a1..10a291e911 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -260,7 +260,7 @@ virInterfaceObjMatch(virInterfaceObjPtr obj, #undef MATCH =20 =20 -struct virInterfaceObjListData { +struct virInterfaceObjListExportData { virConnectPtr conn; virInterfacePtr *ifaces; virInterfaceObjListFilter filter; @@ -274,7 +274,7 @@ virInterfaceObjListPopulate(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { - struct virInterfaceObjListData *data =3D opaque; + struct virInterfaceObjListExportData *data =3D opaque; virInterfaceObjPtr obj =3D payload; virInterfacePtr iface =3D NULL; =20 @@ -316,7 +316,7 @@ virInterfaceObjListExport(virConnectPtr conn, unsigned int flags) { int ret =3D -1; - struct virInterfaceObjListData data =3D { + struct virInterfaceObjListExportData data =3D { .conn =3D conn, .ifaces =3D NULL, .filter =3D filter, .flags =3D f= lags, .nifaces =3D 0, .error =3D false }; =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e00c8a7f6c..cc55b4806d 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1304,7 +1304,7 @@ virNetworkMatch(virNetworkObjPtr obj, #undef MATCH =20 =20 -struct virNetworkObjListData { +struct virNetworkObjListExportData { virConnectPtr conn; virNetworkPtr *nets; virNetworkObjListFilter filter; @@ -1318,7 +1318,7 @@ virNetworkObjListPopulate(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { - struct virNetworkObjListData *data =3D opaque; + struct virNetworkObjListExportData *data =3D opaque; virNetworkObjPtr obj =3D payload; virNetworkPtr net =3D NULL; =20 @@ -1360,7 +1360,7 @@ virNetworkObjListExport(virConnectPtr conn, unsigned int flags) { int ret =3D -1; - struct virNetworkObjListData data =3D { + struct virNetworkObjListExportData data =3D { .conn =3D conn, .nets =3D NULL, .filter =3D filter, .flags =3D fla= gs, .nnets =3D 0, .error =3D false }; =20 diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 48ce3c8141..ba360810f4 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -526,7 +526,7 @@ virSecretObjMatchFlags(virSecretObjPtr obj, #undef MATCH =20 =20 -struct virSecretObjListData { +struct virSecretObjListExportData { virConnectPtr conn; virSecretPtr *secrets; virSecretObjListACLFilter filter; @@ -540,7 +540,7 @@ virSecretObjListExportCallback(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { - struct virSecretObjListData *data =3D opaque; + struct virSecretObjListExportData *data =3D opaque; virSecretObjPtr obj =3D payload; virSecretDefPtr def; virSecretPtr secret =3D NULL; @@ -584,7 +584,7 @@ virSecretObjListExport(virConnectPtr conn, virSecretObjListACLFilter filter, unsigned int flags) { - struct virSecretObjListData data =3D { + struct virSecretObjListExportData data =3D { .conn =3D conn, .secrets =3D NULL, .filter =3D filter, .flags =3D flags, .nsecrets =3D 0, .error =3D false }; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index e66b2ebfb2..bbf707f2f9 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -960,7 +960,7 @@ virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr ob= j, } =20 =20 -struct _virStorageVolObjExportData { +struct virStoragePoolObjVolumeListExportData { virConnectPtr conn; virStoragePoolVolumeACLFilter filter; virStoragePoolDefPtr pooldef; @@ -975,7 +975,7 @@ virStoragePoolObjVolumeListExportCb(void *payload, void *opaque) { virStorageVolObjPtr volobj =3D payload; - struct _virStorageVolObjExportData *data =3D opaque; + struct virStoragePoolObjVolumeListExportData *data =3D opaque; virStorageVolPtr vol =3D NULL; =20 if (data->error) @@ -1012,7 +1012,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolVolumeACLFilter filter) { virStorageVolObjListPtr volumes =3D obj->volumes; - struct _virStorageVolObjExportData data =3D { + struct virStoragePoolObjVolumeListExportData data =3D { .conn =3D conn, .filter =3D filter, .pooldef =3D obj->def, .error = =3D false, .nvols =3D 0, .vols =3D NULL }; =20 @@ -1969,7 +1969,7 @@ virStoragePoolMatch(virStoragePoolObjPtr obj, #undef MATCH =20 =20 -struct _virStoragePoolExportData { +struct virStoragePoolObjListExportData { virConnectPtr conn; virStoragePoolObjListACLFilter filter; bool checkActive; @@ -1988,7 +1988,7 @@ virStoragePoolObjListExportCb(void *payload, void *opaque) { virStoragePoolObjPtr obj =3D payload; - struct _virStoragePoolExportData *data =3D opaque; + struct virStoragePoolObjListExportData *data =3D opaque; virStoragePoolPtr pool =3D NULL; =20 if (data->error) @@ -2026,7 +2026,7 @@ virStoragePoolObjListExport(virConnectPtr conn, virStoragePoolObjListFilter filter, unsigned int flags) { - struct _virStoragePoolExportData data =3D { + struct virStoragePoolObjListExportData data =3D { .conn =3D conn, .filter =3D filter, .flags =3D flags, .error =3D f= alse, .nPools =3D 0, .pools =3D NULL }; =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 20:58:24 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532964317888412.8836016109598; Mon, 30 Jul 2018 08:25:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7CF4A81224; Mon, 30 Jul 2018 15:25:09 +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 2A1BA2007856; Mon, 30 Jul 2018 15:25:09 +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 9B62C18037F6; Mon, 30 Jul 2018 15:25:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6UE850R013578 for ; Mon, 30 Jul 2018 10:08:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id A9C657C5D; Mon, 30 Jul 2018 14:08:05 +0000 (UTC) Received: from dhcp-17-130.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BCF67C5B; Mon, 30 Jul 2018 14:08:05 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Mon, 30 Jul 2018 10:07:52 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Anya Harter Subject: [libvirt] [PATCH 2/3] conf: rename Export Callback functions 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.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 30 Jul 2018 15:25:16 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" to be the name of the export function followed by Callback ex. for virInterfaceObjListExport, the callback function is named virInterfaceObjListExportCallback Signed-off-by: Anya Harter --- src/conf/virinterfaceobj.c | 4 ++-- src/conf/virnetworkobj.c | 4 ++-- src/conf/virstorageobj.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 10a291e911..670909decb 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -270,7 +270,7 @@ struct virInterfaceObjListExportData { }; =20 static int -virInterfaceObjListPopulate(void *payload, +virInterfaceObjListExportCallback(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { @@ -325,7 +325,7 @@ virInterfaceObjListExport(virConnectPtr conn, virHashSize(ifaceobjs->objsName) + 1) < 0) goto cleanup; =20 - virHashForEach(ifaceobjs->objsName, virInterfaceObjListPopulate, &data= ); + virHashForEach(ifaceobjs->objsName, virInterfaceObjListExportCallback,= &data); =20 if (data.error) goto cleanup; diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index cc55b4806d..c8939460a3 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1314,7 +1314,7 @@ struct virNetworkObjListExportData { }; =20 static int -virNetworkObjListPopulate(void *payload, +virNetworkObjListExportCallback(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { @@ -1368,7 +1368,7 @@ virNetworkObjListExport(virConnectPtr conn, if (nets && VIR_ALLOC_N(data.nets, virHashSize(netobjs->objs) + 1) < 0) goto cleanup; =20 - virHashForEach(netobjs->objs, virNetworkObjListPopulate, &data); + virHashForEach(netobjs->objs, virNetworkObjListExportCallback, &data); =20 if (data.error) goto cleanup; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index bbf707f2f9..6b8a0fa58d 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -970,7 +970,7 @@ struct virStoragePoolObjVolumeListExportData { }; =20 static int -virStoragePoolObjVolumeListExportCb(void *payload, +virStoragePoolObjVolumeListExportCallback(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { @@ -1029,7 +1029,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, return -1; } =20 - virHashForEach(volumes->objsName, virStoragePoolObjVolumeListExportCb,= &data); + virHashForEach(volumes->objsName, virStoragePoolObjVolumeListExportCal= lback, &data); virObjectRWUnlock(volumes); =20 if (data.error) @@ -1983,7 +1983,7 @@ struct virStoragePoolObjListExportData { =20 =20 static int -virStoragePoolObjListExportCb(void *payload, +virStoragePoolObjListExportCallback(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { @@ -2035,7 +2035,7 @@ virStoragePoolObjListExport(virConnectPtr conn, if (pools && VIR_ALLOC_N(data.pools, virHashSize(poolobjs->objs) + 1) = < 0) goto error; =20 - virHashForEach(poolobjs->objs, virStoragePoolObjListExportCb, &data); + virHashForEach(poolobjs->objs, virStoragePoolObjListExportCallback, &d= ata); virObjectRWUnlock(poolobjs); =20 if (data.error) --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 20:58:24 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532964291810458.9204245836738; Mon, 30 Jul 2018 08:24:51 -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 9E9B8C0587D1; Mon, 30 Jul 2018 15:24:48 +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 28562604DC; Mon, 30 Jul 2018 15:24:48 +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 E99B518037F3; Mon, 30 Jul 2018 15:24:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6UE85DX013586 for ; Mon, 30 Jul 2018 10:08:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id D345C7C5F; Mon, 30 Jul 2018 14:08:05 +0000 (UTC) Received: from dhcp-17-130.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id B43497C5B; Mon, 30 Jul 2018 14:08:05 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Mon, 30 Jul 2018 10:07:53 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Anya Harter Subject: [libvirt] [PATCH 3/3] conf: rename Match functions 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]); Mon, 30 Jul 2018 15:24:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" to be the vir prefix and interface name followed by ObjMatch ex. for virNetworkObjListExport, the match function is named virNetworkObjMatch Signed-off-by: Anya Harter --- src/conf/virnetworkobj.c | 6 +++--- src/conf/virnodedeviceobj.c | 4 ++-- src/conf/virsecretobj.c | 4 ++-- src/conf/virstorageobj.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index c8939460a3..48d4ffecce 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1272,7 +1272,7 @@ virNetworkObjUpdate(virNetworkObjPtr obj, =20 #define MATCH(FLAG) (flags & (FLAG)) static bool -virNetworkMatch(virNetworkObjPtr obj, +virNetworkObjMatch(virNetworkObjPtr obj, unsigned int flags) { /* filter by active state */ @@ -1331,7 +1331,7 @@ virNetworkObjListExportCallback(void *payload, !data->filter(data->conn, obj->def)) goto cleanup; =20 - if (!virNetworkMatch(obj, data->flags)) + if (!virNetworkObjMatch(obj, data->flags)) goto cleanup; =20 if (!data->nets) { @@ -1547,7 +1547,7 @@ virNetworkObjListPruneHelper(const void *payload, int want =3D 0; =20 virObjectLock(obj); - want =3D virNetworkMatch(obj, data->flags); + want =3D virNetworkObjMatch(obj, data->flags); virObjectUnlock(obj); return want; } diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 6c04caf6ab..f6d940905c 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -804,7 +804,7 @@ virNodeDeviceObjListGetNames(virNodeDeviceObjListPtr de= vs, #define MATCH(FLAG) ((flags & (VIR_CONNECT_LIST_NODE_DEVICES_CAP_ ## FLAG)= ) && \ virNodeDeviceObjHasCap(obj, VIR_NODE_DEV_CAP_ ## FLAG= )) static bool -virNodeDeviceMatch(virNodeDeviceObjPtr obj, +virNodeDeviceObjMatch(virNodeDeviceObjPtr obj, unsigned int flags) { /* Refresh the capabilities first, e.g. due to a driver change */ @@ -864,7 +864,7 @@ virNodeDeviceObjListExportCallback(void *payload, def =3D obj->def; =20 if ((!data->filter || data->filter(data->conn, def)) && - virNodeDeviceMatch(obj, data->flags)) { + virNodeDeviceObjMatch(obj, data->flags)) { if (data->devices) { if (!(device =3D virGetNodeDevice(data->conn, def->name)) || VIR_STRDUP(device->parentName, def->parent) < 0) { diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index ba360810f4..f1a22c5d6c 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -500,7 +500,7 @@ virSecretObjListNumOfSecrets(virSecretObjListPtr secret= s, =20 #define MATCH(FLAG) (flags & (FLAG)) static bool -virSecretObjMatchFlags(virSecretObjPtr obj, +virSecretObjMatch(virSecretObjPtr obj, unsigned int flags) { virSecretDefPtr def =3D obj->def; @@ -554,7 +554,7 @@ virSecretObjListExportCallback(void *payload, if (data->filter && !data->filter(data->conn, def)) goto cleanup; =20 - if (!virSecretObjMatchFlags(obj, data->flags)) + if (!virSecretObjMatch(obj, data->flags)) goto cleanup; =20 if (!data->secrets) { diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 6b8a0fa58d..23a66e8dff 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1906,7 +1906,7 @@ virStoragePoolObjSourceFindDuplicate(virConnectPtr co= nn, =20 #define MATCH(FLAG) (flags & (FLAG)) static bool -virStoragePoolMatch(virStoragePoolObjPtr obj, +virStoragePoolObjMatch(virStoragePoolObjPtr obj, unsigned int flags) { /* filter by active state */ @@ -1999,7 +1999,7 @@ virStoragePoolObjListExportCallback(void *payload, if (data->filter && !data->filter(data->conn, obj->def)) goto cleanup; =20 - if (!virStoragePoolMatch(obj, data->flags)) + if (!virStoragePoolObjMatch(obj, data->flags)) goto cleanup; =20 if (data->pools) { --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list