[libvirt] [PATCH v2 0/3] conf: standardize naming
on vir*ObjListExport call stack Anya Harter (3): conf: rename structs used by Export function conf: rename Export Callback functions conf: rename Match functions src/conf/virinterfaceobj.c | 16 +++++++++------- src/conf/virnetworkobj.c | 24 ++++++++++++----------- src/conf/virnodedeviceobj.c | 14 ++++++++------ src/conf/virsecretobj.c | 14 ++++++++------ src/conf/virstorageobj.c | 38 ++++++++++++++++++++----------------- 5 files changed, 59 insertions(+), 47 deletions(-) -- 2.17.1
name structs to be the name of the Export function followed by Data also tweak definitions to follow standard struct definition pattern ex. for virInterfaceObjListExport, the struct is defined as follows: typedef struct _virInterfaceObjListExportData virInterfaceObjListExportData; typedef virInterfaceObjListExportData *virInterfaceObjListExportDataPtr; struct _virInterfaceObjListExportData {...}; Signed-off-by: Anya Harter <aharter@redhat.com> --- src/conf/virinterfaceobj.c | 8 +++++--- src/conf/virnetworkobj.c | 8 +++++--- src/conf/virnodedeviceobj.c | 8 +++++--- src/conf/virsecretobj.c | 8 +++++--- src/conf/virstorageobj.c | 16 ++++++++++------ 5 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index b0c4ca15a1..0fe0042920 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -260,7 +260,9 @@ virInterfaceObjMatch(virInterfaceObjPtr obj, #undef MATCH -struct virInterfaceObjListData { +typedef struct _virInterfaceObjListExportData virInterfaceObjListExportData; +typedef virInterfaceObjListExportData *virInterfaceObjListExportDataPtr; +struct _virInterfaceObjListExportData { virConnectPtr conn; virInterfacePtr *ifaces; virInterfaceObjListFilter filter; @@ -274,7 +276,7 @@ virInterfaceObjListPopulate(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { - struct virInterfaceObjListData *data = opaque; + virInterfaceObjListExportDataPtr data = opaque; virInterfaceObjPtr obj = payload; virInterfacePtr iface = NULL; @@ -316,7 +318,7 @@ virInterfaceObjListExport(virConnectPtr conn, unsigned int flags) { int ret = -1; - struct virInterfaceObjListData data = { + virInterfaceObjListExportData data = { .conn = conn, .ifaces = NULL, .filter = filter, .flags = flags, .nifaces = 0, .error = false }; diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e00c8a7f6c..f69ee0c2fa 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1304,7 +1304,9 @@ virNetworkMatch(virNetworkObjPtr obj, #undef MATCH -struct virNetworkObjListData { +typedef struct _virNetworkObjListExportData virNetworkObjListExportData; +typedef virNetworkObjListExportData *virNetworkObjListExportDataPtr; +struct _virNetworkObjListExportData { virConnectPtr conn; virNetworkPtr *nets; virNetworkObjListFilter filter; @@ -1318,7 +1320,7 @@ virNetworkObjListPopulate(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { - struct virNetworkObjListData *data = opaque; + virNetworkObjListExportDataPtr data = opaque; virNetworkObjPtr obj = payload; virNetworkPtr net = NULL; @@ -1360,7 +1362,7 @@ virNetworkObjListExport(virConnectPtr conn, unsigned int flags) { int ret = -1; - struct virNetworkObjListData data = { + virNetworkObjListExportData data = { .conn = conn, .nets = NULL, .filter = filter, .flags = flags, .nnets = 0, .error = false }; diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 6c04caf6ab..2c660a080a 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -838,7 +838,9 @@ virNodeDeviceMatch(virNodeDeviceObjPtr obj, #undef MATCH -struct virNodeDeviceObjListExportData { +typedef struct _virNodeDeviceObjListExportData virNodeDeviceObjListExportData; +typedef virNodeDeviceObjListExportData *virNodeDeviceObjListExportDataPtr; +struct _virNodeDeviceObjListExportData { virConnectPtr conn; virNodeDeviceObjListFilter filter; unsigned int flags; @@ -854,7 +856,7 @@ virNodeDeviceObjListExportCallback(void *payload, { virNodeDeviceObjPtr obj = payload; virNodeDeviceDefPtr def; - struct virNodeDeviceObjListExportData *data = opaque; + virNodeDeviceObjListExportDataPtr data = opaque; virNodeDevicePtr device = NULL; if (data->error) @@ -890,7 +892,7 @@ virNodeDeviceObjListExport(virConnectPtr conn, virNodeDeviceObjListFilter filter, unsigned int flags) { - struct virNodeDeviceObjListExportData data = { + virNodeDeviceObjListExportData data = { .conn = conn, .filter = filter, .flags = flags, .devices = NULL, .ndevices = 0, .error = false }; diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 48ce3c8141..c80cf364c6 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -526,7 +526,9 @@ virSecretObjMatchFlags(virSecretObjPtr obj, #undef MATCH -struct virSecretObjListData { +typedef struct _virSecretObjListExportData virSecretObjListExportData; +typedef virSecretObjListExportData *virSecretObjListExportDataPtr; +struct _virSecretObjListExportData { virConnectPtr conn; virSecretPtr *secrets; virSecretObjListACLFilter filter; @@ -540,7 +542,7 @@ virSecretObjListExportCallback(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { - struct virSecretObjListData *data = opaque; + virSecretObjListExportDataPtr data = opaque; virSecretObjPtr obj = payload; virSecretDefPtr def; virSecretPtr secret = NULL; @@ -584,7 +586,7 @@ virSecretObjListExport(virConnectPtr conn, virSecretObjListACLFilter filter, unsigned int flags) { - struct virSecretObjListData data = { + virSecretObjListExportData data = { .conn = conn, .secrets = NULL, .filter = filter, .flags = flags, .nsecrets = 0, .error = false }; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index e66b2ebfb2..0964088fda 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -960,7 +960,9 @@ virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj, } -struct _virStorageVolObjExportData { +typedef struct _virStoragePoolObjVolumeListExportData virStoragePoolObjVolumeListExportData; +typedef virStoragePoolObjVolumeListExportData *virStoragePoolObjVolumeListExportDataPtr; +struct _virStoragePoolObjVolumeListExportData { virConnectPtr conn; virStoragePoolVolumeACLFilter filter; virStoragePoolDefPtr pooldef; @@ -975,7 +977,7 @@ virStoragePoolObjVolumeListExportCb(void *payload, void *opaque) { virStorageVolObjPtr volobj = payload; - struct _virStorageVolObjExportData *data = opaque; + virStoragePoolObjVolumeListExportDataPtr data = opaque; virStorageVolPtr vol = NULL; if (data->error) @@ -1012,7 +1014,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolVolumeACLFilter filter) { virStorageVolObjListPtr volumes = obj->volumes; - struct _virStorageVolObjExportData data = { + virStoragePoolObjVolumeListExportData data = { .conn = conn, .filter = filter, .pooldef = obj->def, .error = false, .nvols = 0, .vols = NULL }; @@ -1969,7 +1971,9 @@ virStoragePoolMatch(virStoragePoolObjPtr obj, #undef MATCH -struct _virStoragePoolExportData { +typedef struct _virStoragePoolObjListExportData virStoragePoolObjListExportData; +typedef virStoragePoolObjListExportData *virStoragePoolObjListExportDataPtr; +struct _virStoragePoolObjListExportData { virConnectPtr conn; virStoragePoolObjListACLFilter filter; bool checkActive; @@ -1988,7 +1992,7 @@ virStoragePoolObjListExportCb(void *payload, void *opaque) { virStoragePoolObjPtr obj = payload; - struct _virStoragePoolExportData *data = opaque; + virStoragePoolObjListExportDataPtr data = opaque; virStoragePoolPtr pool = NULL; if (data->error) @@ -2026,7 +2030,7 @@ virStoragePoolObjListExport(virConnectPtr conn, virStoragePoolObjListFilter filter, unsigned int flags) { - struct _virStoragePoolExportData data = { + virStoragePoolObjListExportData data = { .conn = conn, .filter = filter, .flags = flags, .error = false, .nPools = 0, .pools = NULL }; -- 2.17.1
name functions 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 <aharter@redhat.com> --- src/conf/virinterfaceobj.c | 8 ++++---- src/conf/virnetworkobj.c | 8 ++++---- src/conf/virstorageobj.c | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 0fe0042920..028d699b32 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -272,9 +272,9 @@ struct _virInterfaceObjListExportData { }; static int -virInterfaceObjListPopulate(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) +virInterfaceObjListExportCallback(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) { virInterfaceObjListExportDataPtr data = opaque; virInterfaceObjPtr obj = payload; @@ -327,7 +327,7 @@ virInterfaceObjListExport(virConnectPtr conn, virHashSize(ifaceobjs->objsName) + 1) < 0) goto cleanup; - virHashForEach(ifaceobjs->objsName, virInterfaceObjListPopulate, &data); + virHashForEach(ifaceobjs->objsName, virInterfaceObjListExportCallback, &data); if (data.error) goto cleanup; diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index f69ee0c2fa..69465d7f44 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1316,9 +1316,9 @@ struct _virNetworkObjListExportData { }; static int -virNetworkObjListPopulate(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) +virNetworkObjListExportCallback(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) { virNetworkObjListExportDataPtr data = opaque; virNetworkObjPtr obj = payload; @@ -1370,7 +1370,7 @@ virNetworkObjListExport(virConnectPtr conn, if (nets && VIR_ALLOC_N(data.nets, virHashSize(netobjs->objs) + 1) < 0) goto cleanup; - virHashForEach(netobjs->objs, virNetworkObjListPopulate, &data); + virHashForEach(netobjs->objs, virNetworkObjListExportCallback, &data); if (data.error) goto cleanup; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 0964088fda..02ed491b6f 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -972,9 +972,9 @@ struct _virStoragePoolObjVolumeListExportData { }; static int -virStoragePoolObjVolumeListExportCb(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) +virStoragePoolObjVolumeListExportCallback(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) { virStorageVolObjPtr volobj = payload; virStoragePoolObjVolumeListExportDataPtr data = opaque; @@ -1031,7 +1031,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, return -1; } - virHashForEach(volumes->objsName, virStoragePoolObjVolumeListExportCb, &data); + virHashForEach(volumes->objsName, virStoragePoolObjVolumeListExportCallback, &data); virObjectRWUnlock(volumes); if (data.error) @@ -1987,9 +1987,9 @@ struct _virStoragePoolObjListExportData { static int -virStoragePoolObjListExportCb(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) +virStoragePoolObjListExportCallback(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) { virStoragePoolObjPtr obj = payload; virStoragePoolObjListExportDataPtr data = opaque; @@ -2039,7 +2039,7 @@ virStoragePoolObjListExport(virConnectPtr conn, if (pools && VIR_ALLOC_N(data.pools, virHashSize(poolobjs->objs) + 1) < 0) goto error; - virHashForEach(poolobjs->objs, virStoragePoolObjListExportCb, &data); + virHashForEach(poolobjs->objs, virStoragePoolObjListExportCallback, &data); virObjectRWUnlock(poolobjs); if (data.error) -- 2.17.1
name match functions 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 <aharter@redhat.com> --- src/conf/virnetworkobj.c | 8 ++++---- src/conf/virnodedeviceobj.c | 6 +++--- src/conf/virsecretobj.c | 6 +++--- src/conf/virstorageobj.c | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 69465d7f44..75a48601fa 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1272,8 +1272,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) && @@ -1333,7 +1333,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) { @@ -1549,7 +1549,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 2c660a080a..c8ad1314b5 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 c80cf364c6..2ff2998c15 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 02ed491b6f..b44ce99dd5 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1908,8 +1908,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) && @@ -2003,7 +2003,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) { -- 2.17.1
On Mon, 2018-08-13 at 11:55 -0400, Anya Harter wrote:
on vir*ObjListExport call stack
Anya Harter (3): conf: rename structs used by Export function conf: rename Export Callback functions conf: rename Match functions
src/conf/virinterfaceobj.c | 16 +++++++++------- src/conf/virnetworkobj.c | 24 ++++++++++++----------- src/conf/virnodedeviceobj.c | 14 ++++++++------ src/conf/virsecretobj.c | 14 ++++++++------ src/conf/virstorageobj.c | 38 ++++++++++++++++++++----------------- 5 files changed, 59 insertions(+), 47 deletions(-)
For the entire series Reviewed-by: Andrea Bolognani <abologna@redhat.com> and pushed. -- Andrea Bolognani / Red Hat / Virtualization
participants (2)
-
Andrea Bolognani -
Anya Harter