From 7906d5fbbba1229f10777f581f91a30063d48847 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 29 Apr 2015 15:25:34 +0200 Subject: [PATCH] conf: Rename virDomainObjListFilter type to virDomainObjListACLFilter The passed function is meant to filter domains according to ACL match. --- src/conf/domain_conf.c | 16 ++++++++-------- src/conf/domain_conf.h | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6f43984dbc..460f67b590 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22081,7 +22081,7 @@ virDomainGetFilesystemForTarget(virDomainDefPtr def, struct virDomainObjListData { - virDomainObjListFilter filter; + virDomainObjListACLFilter filter; virConnectPtr conn; bool active; int count; @@ -22112,7 +22112,7 @@ virDomainObjListCount(void *payload, int virDomainObjListNumOfDomains(virDomainObjListPtr doms, bool active, - virDomainObjListFilter filter, + virDomainObjListACLFilter filter, virConnectPtr conn) { struct virDomainObjListData data = { filter, conn, active, 0 }; @@ -22123,7 +22123,7 @@ virDomainObjListNumOfDomains(virDomainObjListPtr doms, } struct virDomainIDData { - virDomainObjListFilter filter; + virDomainObjListACLFilter filter; virConnectPtr conn; int numids; int maxids; @@ -22151,7 +22151,7 @@ int virDomainObjListGetActiveIDs(virDomainObjListPtr doms, int *ids, int maxids, - virDomainObjListFilter filter, + virDomainObjListACLFilter filter, virConnectPtr conn) { struct virDomainIDData data = { filter, conn, @@ -22163,7 +22163,7 @@ virDomainObjListGetActiveIDs(virDomainObjListPtr doms, } struct virDomainNameData { - virDomainObjListFilter filter; + virDomainObjListACLFilter filter; virConnectPtr conn; int oom; int numnames; @@ -22201,7 +22201,7 @@ int virDomainObjListGetInactiveNames(virDomainObjListPtr doms, char **const names, int maxnames, - virDomainObjListFilter filter, + virDomainObjListACLFilter filter, virConnectPtr conn) { struct virDomainNameData data = { filter, conn, @@ -23033,7 +23033,7 @@ virDomainObjMatchFilter(virDomainObjPtr vm, struct virDomainListData { virConnectPtr conn; virDomainPtr *domains; - virDomainObjListFilter filter; + virDomainObjListACLFilter filter; unsigned int flags; int ndomains; bool error; @@ -23087,7 +23087,7 @@ int virDomainObjListExport(virDomainObjListPtr doms, virConnectPtr conn, virDomainPtr **domains, - virDomainObjListFilter filter, + virDomainObjListACLFilter filter, unsigned int flags) { int ret = -1; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 345f882891..7173f69826 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2321,8 +2321,8 @@ struct _virDomainObj { typedef struct _virDomainObjList virDomainObjList; typedef virDomainObjList *virDomainObjListPtr; -typedef bool (*virDomainObjListFilter)(virConnectPtr conn, - virDomainDefPtr def); +typedef bool (*virDomainObjListACLFilter)(virConnectPtr conn, + virDomainDefPtr def); /* This structure holds various callbacks and data needed @@ -2843,18 +2843,18 @@ unsigned int virDomainVideoDefaultRAM(const virDomainDef *def, int virDomainObjListNumOfDomains(virDomainObjListPtr doms, bool active, - virDomainObjListFilter filter, + virDomainObjListACLFilter filter, virConnectPtr conn); int virDomainObjListGetActiveIDs(virDomainObjListPtr doms, int *ids, int maxids, - virDomainObjListFilter filter, + virDomainObjListACLFilter filter, virConnectPtr conn); int virDomainObjListGetInactiveNames(virDomainObjListPtr doms, char **const names, int maxnames, - virDomainObjListFilter filter, + virDomainObjListACLFilter filter, virConnectPtr conn); typedef int (*virDomainObjListIterator)(virDomainObjPtr dom, @@ -3054,7 +3054,7 @@ VIR_ENUM_DECL(virDomainStartupPolicy) int virDomainObjListExport(virDomainObjListPtr doms, virConnectPtr conn, virDomainPtr **domains, - virDomainObjListFilter filter, + virDomainObjListACLFilter filter, unsigned int flags); int -- GitLab