diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 7366e98219337451aea167780b010b543c18b2a1..e6b01388f51c1b48d3aab2e0fad9935a68b769c9 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1284,8 +1284,8 @@ virNetworkObjUpdate(virNetworkObjPtr obj, #define MATCH(FLAG) (flags & (FLAG)) static bool -virNetworkMatch(virNetworkObjPtr obj, - unsigned int flags) +virNetworkObjMatch(virNetworkObjPtr obj, + unsigned int flags) { /* filter by active state */ if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE) && @@ -1345,7 +1345,7 @@ virNetworkObjListExportCallback(void *payload, !data->filter(data->conn, obj->def)) goto cleanup; - if (!virNetworkMatch(obj, data->flags)) + if (!virNetworkObjMatch(obj, data->flags)) goto cleanup; if (!data->nets) { @@ -1561,7 +1561,7 @@ virNetworkObjListPruneHelper(const void *payload, int want = 0; virObjectLock(obj); - want = virNetworkMatch(obj, data->flags); + want = virNetworkObjMatch(obj, data->flags); virObjectUnlock(obj); return want; } diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 2c660a080a86d2fcf6e91991d61aad5be8a2efa2..c8ad1314b54fa374f9280e6272f593a60c842b87 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -804,8 +804,8 @@ virNodeDeviceObjListGetNames(virNodeDeviceObjListPtr devs, #define MATCH(FLAG) ((flags & (VIR_CONNECT_LIST_NODE_DEVICES_CAP_ ## FLAG)) && \ virNodeDeviceObjHasCap(obj, VIR_NODE_DEV_CAP_ ## FLAG)) static bool -virNodeDeviceMatch(virNodeDeviceObjPtr obj, - unsigned int flags) +virNodeDeviceObjMatch(virNodeDeviceObjPtr obj, + unsigned int flags) { /* Refresh the capabilities first, e.g. due to a driver change */ if (!obj->skipUpdateCaps && @@ -866,7 +866,7 @@ virNodeDeviceObjListExportCallback(void *payload, def = obj->def; if ((!data->filter || data->filter(data->conn, def)) && - virNodeDeviceMatch(obj, data->flags)) { + virNodeDeviceObjMatch(obj, data->flags)) { if (data->devices) { if (!(device = 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 c80cf364c6fcde7e108f282fcd9e96715eeed507..2ff2998c1573db5f24718a69f5577cd10ca21de7 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -500,8 +500,8 @@ virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, #define MATCH(FLAG) (flags & (FLAG)) static bool -virSecretObjMatchFlags(virSecretObjPtr obj, - unsigned int flags) +virSecretObjMatch(virSecretObjPtr obj, + unsigned int flags) { virSecretDefPtr def = obj->def; @@ -556,7 +556,7 @@ virSecretObjListExportCallback(void *payload, if (data->filter && !data->filter(data->conn, def)) goto cleanup; - if (!virSecretObjMatchFlags(obj, data->flags)) + if (!virSecretObjMatch(obj, data->flags)) goto cleanup; if (!data->secrets) { diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 15637597324d174f3b9ece486badf4c61271c00e..6f1e14ed3ed6cbf5b17f28625d9f2d192d9677f7 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1910,8 +1910,8 @@ virStoragePoolObjSourceFindDuplicate(virConnectPtr conn, #define MATCH(FLAG) (flags & (FLAG)) static bool -virStoragePoolMatch(virStoragePoolObjPtr obj, - unsigned int flags) +virStoragePoolObjMatch(virStoragePoolObjPtr obj, + unsigned int flags) { /* filter by active state */ if (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) && @@ -2005,7 +2005,7 @@ virStoragePoolObjListExportCallback(void *payload, if (data->filter && !data->filter(data->conn, obj->def)) goto cleanup; - if (!virStoragePoolMatch(obj, data->flags)) + if (!virStoragePoolObjMatch(obj, data->flags)) goto cleanup; if (data->pools) {