[libvirt] [PATCH 10/48] list: Change MATCH for common use in virsh

Osier Yang jyang at redhat.com
Fri Aug 3 15:48:13 UTC 2012


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 b57c390..fcdcb09 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 a77b7ba..cfb671f 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




More information about the libvir-list mailing list