[libvirt] [PATCH 08/45] list: Change MATCH for common use in virsh

Move definition of MATCH from virsh-domain-monitor.c into virsh.c for further use. --- tools/virsh-domain-monitor.c | 2 -- tools/virsh.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 1272a05..c6bea37 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1309,7 +1309,6 @@ vshDomainListFree(vshDomainListPtr domlist) VIR_FREE(domlist); } -#define MATCH(FLAG) (flags & (FLAG)) static vshDomainListPtr vshDomainListCollect(vshControl *ctl, unsigned int flags) { @@ -1528,7 +1527,6 @@ cleanup: VIR_FREE(ids); return list; } -#undef MATCH static const vshCmdOptDef opts_list[] = { {"inactive", VSH_OT_BOOL, 0, N_("list inactive domains")}, diff --git a/tools/virsh.c b/tools/virsh.c index 3df0963..f27dd2c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -94,6 +94,8 @@ static char *progname; /* Default escape char Ctrl-] as per telnet */ #define CTRL_CLOSE_BRACKET "^]" +#define MATCH(FLAG) (flags & (FLAG)) + /** * The log configuration */ -- 1.7.7.3