提交 7906d5fb 编写于 作者: P Peter Krempa

conf: Rename virDomainObjListFilter type to virDomainObjListACLFilter

The passed function is meant to filter domains according to ACL match.
上级 684675c3
...@@ -22081,7 +22081,7 @@ virDomainGetFilesystemForTarget(virDomainDefPtr def, ...@@ -22081,7 +22081,7 @@ virDomainGetFilesystemForTarget(virDomainDefPtr def,
struct virDomainObjListData { struct virDomainObjListData {
virDomainObjListFilter filter; virDomainObjListACLFilter filter;
virConnectPtr conn; virConnectPtr conn;
bool active; bool active;
int count; int count;
...@@ -22112,7 +22112,7 @@ virDomainObjListCount(void *payload, ...@@ -22112,7 +22112,7 @@ virDomainObjListCount(void *payload,
int int
virDomainObjListNumOfDomains(virDomainObjListPtr doms, virDomainObjListNumOfDomains(virDomainObjListPtr doms,
bool active, bool active,
virDomainObjListFilter filter, virDomainObjListACLFilter filter,
virConnectPtr conn) virConnectPtr conn)
{ {
struct virDomainObjListData data = { filter, conn, active, 0 }; struct virDomainObjListData data = { filter, conn, active, 0 };
...@@ -22123,7 +22123,7 @@ virDomainObjListNumOfDomains(virDomainObjListPtr doms, ...@@ -22123,7 +22123,7 @@ virDomainObjListNumOfDomains(virDomainObjListPtr doms,
} }
struct virDomainIDData { struct virDomainIDData {
virDomainObjListFilter filter; virDomainObjListACLFilter filter;
virConnectPtr conn; virConnectPtr conn;
int numids; int numids;
int maxids; int maxids;
...@@ -22151,7 +22151,7 @@ int ...@@ -22151,7 +22151,7 @@ int
virDomainObjListGetActiveIDs(virDomainObjListPtr doms, virDomainObjListGetActiveIDs(virDomainObjListPtr doms,
int *ids, int *ids,
int maxids, int maxids,
virDomainObjListFilter filter, virDomainObjListACLFilter filter,
virConnectPtr conn) virConnectPtr conn)
{ {
struct virDomainIDData data = { filter, conn, struct virDomainIDData data = { filter, conn,
...@@ -22163,7 +22163,7 @@ virDomainObjListGetActiveIDs(virDomainObjListPtr doms, ...@@ -22163,7 +22163,7 @@ virDomainObjListGetActiveIDs(virDomainObjListPtr doms,
} }
struct virDomainNameData { struct virDomainNameData {
virDomainObjListFilter filter; virDomainObjListACLFilter filter;
virConnectPtr conn; virConnectPtr conn;
int oom; int oom;
int numnames; int numnames;
...@@ -22201,7 +22201,7 @@ int ...@@ -22201,7 +22201,7 @@ int
virDomainObjListGetInactiveNames(virDomainObjListPtr doms, virDomainObjListGetInactiveNames(virDomainObjListPtr doms,
char **const names, char **const names,
int maxnames, int maxnames,
virDomainObjListFilter filter, virDomainObjListACLFilter filter,
virConnectPtr conn) virConnectPtr conn)
{ {
struct virDomainNameData data = { filter, conn, struct virDomainNameData data = { filter, conn,
...@@ -23033,7 +23033,7 @@ virDomainObjMatchFilter(virDomainObjPtr vm, ...@@ -23033,7 +23033,7 @@ virDomainObjMatchFilter(virDomainObjPtr vm,
struct virDomainListData { struct virDomainListData {
virConnectPtr conn; virConnectPtr conn;
virDomainPtr *domains; virDomainPtr *domains;
virDomainObjListFilter filter; virDomainObjListACLFilter filter;
unsigned int flags; unsigned int flags;
int ndomains; int ndomains;
bool error; bool error;
...@@ -23087,7 +23087,7 @@ int ...@@ -23087,7 +23087,7 @@ int
virDomainObjListExport(virDomainObjListPtr doms, virDomainObjListExport(virDomainObjListPtr doms,
virConnectPtr conn, virConnectPtr conn,
virDomainPtr **domains, virDomainPtr **domains,
virDomainObjListFilter filter, virDomainObjListACLFilter filter,
unsigned int flags) unsigned int flags)
{ {
int ret = -1; int ret = -1;
......
...@@ -2321,8 +2321,8 @@ struct _virDomainObj { ...@@ -2321,8 +2321,8 @@ struct _virDomainObj {
typedef struct _virDomainObjList virDomainObjList; typedef struct _virDomainObjList virDomainObjList;
typedef virDomainObjList *virDomainObjListPtr; typedef virDomainObjList *virDomainObjListPtr;
typedef bool (*virDomainObjListFilter)(virConnectPtr conn, typedef bool (*virDomainObjListACLFilter)(virConnectPtr conn,
virDomainDefPtr def); virDomainDefPtr def);
/* This structure holds various callbacks and data needed /* This structure holds various callbacks and data needed
...@@ -2843,18 +2843,18 @@ unsigned int virDomainVideoDefaultRAM(const virDomainDef *def, ...@@ -2843,18 +2843,18 @@ unsigned int virDomainVideoDefaultRAM(const virDomainDef *def,
int virDomainObjListNumOfDomains(virDomainObjListPtr doms, int virDomainObjListNumOfDomains(virDomainObjListPtr doms,
bool active, bool active,
virDomainObjListFilter filter, virDomainObjListACLFilter filter,
virConnectPtr conn); virConnectPtr conn);
int virDomainObjListGetActiveIDs(virDomainObjListPtr doms, int virDomainObjListGetActiveIDs(virDomainObjListPtr doms,
int *ids, int *ids,
int maxids, int maxids,
virDomainObjListFilter filter, virDomainObjListACLFilter filter,
virConnectPtr conn); virConnectPtr conn);
int virDomainObjListGetInactiveNames(virDomainObjListPtr doms, int virDomainObjListGetInactiveNames(virDomainObjListPtr doms,
char **const names, char **const names,
int maxnames, int maxnames,
virDomainObjListFilter filter, virDomainObjListACLFilter filter,
virConnectPtr conn); virConnectPtr conn);
typedef int (*virDomainObjListIterator)(virDomainObjPtr dom, typedef int (*virDomainObjListIterator)(virDomainObjPtr dom,
...@@ -3054,7 +3054,7 @@ VIR_ENUM_DECL(virDomainStartupPolicy) ...@@ -3054,7 +3054,7 @@ VIR_ENUM_DECL(virDomainStartupPolicy)
int virDomainObjListExport(virDomainObjListPtr doms, int virDomainObjListExport(virDomainObjListPtr doms,
virConnectPtr conn, virConnectPtr conn,
virDomainPtr **domains, virDomainPtr **domains,
virDomainObjListFilter filter, virDomainObjListACLFilter filter,
unsigned int flags); unsigned int flags);
int int
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册