[PATCH 3/6] conf: Rename virDomainObjListFilter type to virDomainObjListACLFilter

[Peter Krempa <pkrempa@xxxxxxxxxx>]

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 057602b..c2b7d6a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -22043,7 +22043,7 @@ virDomainGetFilesystemForTarget(virDomainDefPtr def,


 struct virDomainObjListData {
-    virDomainObjListFilter filter;
+    virDomainObjListACLFilter filter;
     virConnectPtr conn;
     bool active;
     int count;
@@ -22074,7 +22074,7 @@ virDomainObjListCount(void *payload,
 int
 virDomainObjListNumOfDomains(virDomainObjListPtr doms,
                              bool active,
-                             virDomainObjListFilter filter,
+                             virDomainObjListACLFilter filter,
                              virConnectPtr conn)
 {
     struct virDomainObjListData data = { filter, conn, active, 0 };
@@ -22085,7 +22085,7 @@ virDomainObjListNumOfDomains(virDomainObjListPtr doms,
 }

 struct virDomainIDData {
-    virDomainObjListFilter filter;
+    virDomainObjListACLFilter filter;
     virConnectPtr conn;
     int numids;
     int maxids;
@@ -22113,7 +22113,7 @@ int
 virDomainObjListGetActiveIDs(virDomainObjListPtr doms,
                              int *ids,
                              int maxids,
-                             virDomainObjListFilter filter,
+                             virDomainObjListACLFilter filter,
                              virConnectPtr conn)
 {
     struct virDomainIDData data = { filter, conn,
@@ -22125,7 +22125,7 @@ virDomainObjListGetActiveIDs(virDomainObjListPtr doms,
 }

 struct virDomainNameData {
-    virDomainObjListFilter filter;
+    virDomainObjListACLFilter filter;
     virConnectPtr conn;
     int oom;
     int numnames;
@@ -22163,7 +22163,7 @@ int
 virDomainObjListGetInactiveNames(virDomainObjListPtr doms,
                                  char **const names,
                                  int maxnames,
-                                 virDomainObjListFilter filter,
+                                 virDomainObjListACLFilter filter,
                                  virConnectPtr conn)
 {
     struct virDomainNameData data = { filter, conn,
@@ -22995,7 +22995,7 @@ virDomainObjMatchFilter(virDomainObjPtr vm,
 struct virDomainListData {
     virConnectPtr conn;
     virDomainPtr *domains;
-    virDomainObjListFilter filter;
+    virDomainObjListACLFilter filter;
     unsigned int flags;
     int ndomains;
     bool error;
@@ -23049,7 +23049,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 11e4bb9..bbfe96e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2318,8 +2318,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
@@ -2840,18 +2840,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,
@@ -3051,7 +3051,7 @@ VIR_ENUM_DECL(virDomainStartupPolicy)
 int virDomainObjListExport(virDomainObjListPtr doms,
                            virConnectPtr conn,
                            virDomainPtr **domains,
-                           virDomainObjListFilter filter,
+                           virDomainObjListACLFilter filter,
                            unsigned int flags);

 int
-- 
2.3.5

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list