[libvirt] [PATCH 0/4] Alter @aclfilter to just @filter
From recent review comments in the network series, Michal and Pavel have both stated the preference to use @filter, so to be consistent, rename variables that were changed in prior series.
John Ferlan (4): nodedev: Alter @aclfilter to just @filter nwfilter: Alter @aclfilter to just @filter secret: Alter @aclfilter to just @filter storage: Alter @aclfilter to just @filter src/conf/virnodedeviceobj.c | 28 ++++++++++++++-------------- src/conf/virnodedeviceobj.h | 6 +++--- src/conf/virnwfilterobj.c | 18 +++++++++--------- src/conf/virnwfilterobj.h | 6 +++--- src/conf/virsecretobj.c | 24 ++++++++++++------------ src/conf/virsecretobj.h | 6 +++--- src/conf/virstorageobj.c | 20 ++++++++++---------- src/conf/virstorageobj.h | 10 +++++----- 8 files changed, 59 insertions(+), 59 deletions(-) -- 2.9.4
Rename the variable, recent review requested just use of @filter, so be consistent throughout. Signed-off-by: John Ferlan <jferlan@redhat.com> --- 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, struct virNodeDeviceCountData { virConnectPtr conn; - virNodeDeviceObjListFilter aclfilter; + virNodeDeviceObjListFilter filter; const char *matchstr; int count; }; @@ -745,11 +745,11 @@ virNodeDeviceObjListNumOfDevicesCallback(void *payload, virNodeDeviceObjPtr obj = payload; virNodeDeviceDefPtr def; struct virNodeDeviceCountData *data = opaque; - virNodeDeviceObjListFilter aclfilter = data->aclfilter; + virNodeDeviceObjListFilter filter = data->filter; virObjectLock(obj); def = obj->def; - if ((!aclfilter || aclfilter(data->conn, def)) && + if ((!filter || filter(data->conn, def)) && (!data->matchstr || virNodeDeviceObjHasCap(obj, data->matchstr))) data->count++; @@ -762,10 +762,10 @@ int virNodeDeviceObjListNumOfDevices(virNodeDeviceObjListPtr devs, virConnectPtr conn, const char *cap, - virNodeDeviceObjListFilter aclfilter) + virNodeDeviceObjListFilter filter) { struct virNodeDeviceCountData data = { - .conn = conn, .aclfilter = aclfilter, .matchstr = cap, .count = 0 }; + .conn = conn, .filter = filter, .matchstr = cap, .count = 0 }; virObjectLock(devs); virHashForEach(devs->objs, virNodeDeviceObjListNumOfDevicesCallback, &data); @@ -777,7 +777,7 @@ virNodeDeviceObjListNumOfDevices(virNodeDeviceObjListPtr devs, struct virNodeDeviceGetNamesData { virConnectPtr conn; - virNodeDeviceObjListFilter aclfilter; + virNodeDeviceObjListFilter filter; const char *matchstr; int nnames; char **names; @@ -793,7 +793,7 @@ virNodeDeviceObjListGetNamesCallback(void *payload, virNodeDeviceObjPtr obj = payload; virNodeDeviceDefPtr def; struct virNodeDeviceGetNamesData *data = opaque; - virNodeDeviceObjListFilter aclfilter = data->aclfilter; + virNodeDeviceObjListFilter filter = data->filter; if (data->error) return 0; @@ -801,7 +801,7 @@ virNodeDeviceObjListGetNamesCallback(void *payload, virObjectLock(obj); def = obj->def; - 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 = 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 = { - .conn = conn, .aclfilter = aclfilter, .matchstr = cap, .names = names, + .conn = conn, .filter = filter, .matchstr = cap, .names = names, .nnames = 0, .maxnames = maxnames, .error = false }; virObjectLock(devs); @@ -878,7 +878,7 @@ virNodeDeviceMatch(virNodeDeviceObjPtr obj, 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 = obj->def; - 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 = 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 = { - .conn = conn, .aclfilter = aclfilter, .flags = flags, + .conn = conn, .filter = filter, .flags = flags, .devices = NULL, .ndevices = 0, .error = false }; 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); 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); #endif /* __VIRNODEDEVICEOBJ_H__ */ -- 2.9.4
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 <jferlan@redhat.com> --- 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 nwfilters, int virNWFilterObjListNumOfNWFilters(virNWFilterObjListPtr nwfilters, virConnectPtr conn, - virNWFilterObjListFilter aclfilter) + virNWFilterObjListFilter filter) { size_t i; int nfilters = 0; @@ -406,7 +406,7 @@ virNWFilterObjListNumOfNWFilters(virNWFilterObjListPtr nwfilters, for (i = 0; i < nwfilters->count; i++) { virNWFilterObjPtr obj = 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 nwfilters, virNWFilterObjPtr obj = nwfilters->objs[i]; virNWFilterObjLock(obj); def = 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 = NULL; int nfilters = 0; - virNWFilterPtr filter = NULL; + virNWFilterPtr nwfilter = NULL; virNWFilterObjPtr obj = NULL; virNWFilterDefPtr def; size_t i; @@ -476,12 +476,12 @@ virNWFilterObjListExport(virConnectPtr conn, obj = nwfilters->objs[i]; virNWFilterObjLock(obj); def = obj->def; - if (!aclfilter || aclfilter(conn, def)) { - if (!(filter = virGetNWFilter(conn, def->name, def->uuid))) { + if (!filter || filter(conn, def)) { + if (!(nwfilter = virGetNWFilter(conn, def->name, def->uuid))) { virNWFilterObjUnlock(obj); goto cleanup; } - tmp_filters[nfilters++] = filter; + tmp_filters[nfilters++] = 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); int virNWFilterObjListGetNames(virNWFilterObjListPtr nwfilters, virConnectPtr conn, - virNWFilterObjListFilter aclfilter, + virNWFilterObjListFilter filter, char **const names, int maxnames); @@ -99,7 +99,7 @@ int virNWFilterObjListExport(virConnectPtr conn, virNWFilterObjListPtr nwfilters, virNWFilterPtr **filters, - virNWFilterObjListFilter aclfilter); + virNWFilterObjListFilter filter); int virNWFilterObjListLoadAllConfigs(virNWFilterObjListPtr nwfilters, -- 2.9.4
Rename the variable, recent review requested just use of @filter, so be consistent throughout. Signed-off-by: John Ferlan <jferlan@redhat.com> --- 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, struct virSecretCountData { virConnectPtr conn; - virSecretObjListACLFilter aclfilter; + virSecretObjListACLFilter filter; int count; }; @@ -428,7 +428,7 @@ virSecretObjListNumOfSecretsCallback(void *payload, virObjectLock(obj); def = obj->def; - if (data->aclfilter && !data->aclfilter(data->conn, def)) + if (data->filter && !data->filter(data->conn, def)) goto cleanup; data->count++; @@ -441,7 +441,7 @@ virSecretObjListNumOfSecretsCallback(void *payload, struct virSecretListData { virConnectPtr conn; - virSecretObjListACLFilter aclfilter; + virSecretObjListACLFilter filter; int nuuids; char **uuids; int maxuuids; @@ -467,7 +467,7 @@ virSecretObjListGetUUIDsCallback(void *payload, virObjectLock(obj); def = obj->def; - if (data->aclfilter && !data->aclfilter(data->conn, def)) + if (data->filter && !data->filter(data->conn, def)) goto cleanup; if (data->uuids) { @@ -490,11 +490,11 @@ virSecretObjListGetUUIDsCallback(void *payload, int virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn) { struct virSecretCountData data = { - .conn = conn, .aclfilter = aclfilter, .count = 0 }; + .conn = conn, .filter = filter, .count = 0 }; virObjectLock(secrets); virHashForEach(secrets->objs, virSecretObjListNumOfSecretsCallback, &data); @@ -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 = obj->def; - if (data->aclfilter && !data->aclfilter(data->conn, def)) + if (data->filter && !data->filter(data->conn, def)) goto cleanup; 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 = { .conn = conn, .secrets = NULL, - .aclfilter = aclfilter, .flags = flags, + .filter = filter, .flags = flags, .nsecrets = 0, .error = false }; virObjectLock(secretobjs); @@ -626,11 +626,11 @@ int virSecretObjListGetUUIDs(virSecretObjListPtr secrets, char **uuids, int maxuuids, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn) { struct virSecretListData data = { - .conn = conn, .aclfilter = aclfilter, .uuids = uuids, .nuuids = 0, + .conn = conn, .filter = filter, .uuids = uuids, .nuuids = 0, .maxuuids = maxuuids, .error = false }; 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 int virSecretObjListNumOfSecrets(virSecretObjListPtr secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn); int virSecretObjListExport(virConnectPtr conn, virSecretObjListPtr secretobjs, virSecretPtr **secrets, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, unsigned int flags); int virSecretObjListGetUUIDs(virSecretObjListPtr secrets, char **uuids, int maxuuids, - virSecretObjListACLFilter aclfilter, + virSecretObjListACLFilter filter, virConnectPtr conn); int -- 2.9.4
Rename the variable, recent review requested just use of @filter, so be consistent throughout. Signed-off-by: John Ferlan <jferlan@redhat.com> --- 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 = obj->def; virStorageVolDefListPtr volumes = &obj->volumes; @@ -207,7 +207,7 @@ virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj, for (i = 0; i < volumes->count; i++) { virStorageVolDefPtr def = 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 obj, for (i = 0; i < volumes->count && nnames < maxnames; i++) { virStorageVolDefPtr def = 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 = obj->def; virStorageVolDefListPtr volumes = &obj->volumes; @@ -272,7 +272,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, for (i = 0; i < volumes->count; i++) { virStorageVolDefPtr def = volumes->objs[i]; - if (aclfilter && !aclfilter(conn, pooldef, def)) + if (filter && !filter(conn, pooldef, def)) continue; if (!(vol = virGetStorageVol(conn, pooldef->name, def->name, def->key, NULL, NULL))) @@ -562,7 +562,7 @@ int virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilter) + virStoragePoolObjListACLFilter filter) { int npools = 0; size_t i; @@ -570,7 +570,7 @@ virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools, for (i = 0; i < pools->count; i++) { virStoragePoolObjPtr obj = pools->objs[i]; virStoragePoolObjLock(obj); - if (!aclfilter || aclfilter(conn, obj->def)) { + if (!filter || filter(conn, obj->def)) { if (wantActive == 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 pools, for (i = 0; i < pools->count && nnames < maxnames; i++) { virStoragePoolObjPtr obj = pools->objs[i]; virStoragePoolObjLock(obj); - if (!aclfilter || aclfilter(conn, obj->def)) { + if (!filter || filter(conn, obj->def)) { if (wantActive == 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); int virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj, virConnectPtr conn, - virStoragePoolVolumeACLFilter aclfilter, + virStoragePoolVolumeACLFilter filter, char **const names, int maxnames); @@ -129,7 +129,7 @@ int virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolObjPtr obj, virStorageVolPtr **vols, - virStoragePoolVolumeACLFilter aclfilter); + virStoragePoolVolumeACLFilter filter); virStoragePoolObjPtr virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, @@ -150,13 +150,13 @@ int virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilter); + virStoragePoolObjListACLFilter filter); int virStoragePoolObjGetNames(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, - virStoragePoolObjListACLFilter aclfilter, + virStoragePoolObjListACLFilter filter, char **const names, int maxnames); -- 2.9.4
On 08/16/2017 03:38 PM, John Ferlan wrote:
From recent review comments in the network series, Michal and Pavel have both stated the preference to use @filter, so to be consistent, rename variables that were changed in prior series.
John Ferlan (4): nodedev: Alter @aclfilter to just @filter nwfilter: Alter @aclfilter to just @filter secret: Alter @aclfilter to just @filter storage: Alter @aclfilter to just @filter
src/conf/virnodedeviceobj.c | 28 ++++++++++++++-------------- src/conf/virnodedeviceobj.h | 6 +++--- src/conf/virnwfilterobj.c | 18 +++++++++--------- src/conf/virnwfilterobj.h | 6 +++--- src/conf/virsecretobj.c | 24 ++++++++++++------------ src/conf/virsecretobj.h | 6 +++--- src/conf/virstorageobj.c | 20 ++++++++++---------- src/conf/virstorageobj.h | 10 +++++----- 8 files changed, 59 insertions(+), 59 deletions(-)
ACK, thank you for doing this. Michal
participants (2)
-
John Ferlan -
Michal Privoznik