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

Osier Yang jyang at redhat.com
Tue Sep 4 15:16:31 UTC 2012


Move definition of MATCH from virsh-domain-monitor.c into
virsh.h for further use.
---
 tools/virsh-domain-monitor.c |    2 --
 tools/virsh.h                |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 7e252d2..e599159 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -1290,7 +1290,6 @@ vshDomainListFree(vshDomainListPtr domlist)
     VIR_FREE(domlist);
 }
 
-#define MATCH(FLAG) (flags & (FLAG))
 static vshDomainListPtr
 vshDomainListCollect(vshControl *ctl, unsigned int flags)
 {
@@ -1509,7 +1508,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.h b/tools/virsh.h
index 2a9c6a2..2758d37 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -47,6 +47,8 @@
 
 # define GETTIMEOFDAY(T) gettimeofday(T, NULL)
 
+# define MATCH(FLAG) (flags & (FLAG))
+
 /**
  * The log configuration
  */
-- 
1.7.7.3




More information about the libvir-list mailing list