[libvirt] [PATCH v3 02/14] virsh: Move VIRSH_COMMON_OPT_POOL to virsh.h

John Ferlan jferlan at redhat.com
Sat Jan 9 13:36:23 UTC 2016


Since it can be used by other virsh*.c modules, move the macro to virsh.h
and add virsh.h to POTFILES.in (since there are translatable strings).

Signed-off-by: John Ferlan <jferlan at redhat.com>
---
 po/POTFILES.in     |  1 +
 tools/virsh-pool.c |  7 -------
 tools/virsh.h      | 10 ++++++++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 82e8d3e..46d3940 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -265,6 +265,7 @@ src/xenconfig/xen_xm.c
 tests/virpolkittest.c
 tools/libvirt-guests.sh.in
 tools/virsh.c
+tools/virsh.h
 tools/virsh-console.c
 tools/virsh-domain-monitor.c
 tools/virsh-domain.c
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index dcac0ba..1644a8a 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -33,13 +33,6 @@
 #include "conf/storage_conf.h"
 #include "virstring.h"
 
-#define VIRSH_COMMON_OPT_POOL                                 \
-    {.name = "pool",                                          \
-     .type = VSH_OT_DATA,                                     \
-     .flags = VSH_OFLAG_REQ,                                  \
-     .help = N_("pool name or uuid")                          \
-    }                                                         \
-
 #define VIRSH_COMMON_OPT_POOL_FILE                            \
     {.name = "file",                                          \
      .type = VSH_OT_DATA,                                     \
diff --git a/tools/virsh.h b/tools/virsh.h
index 3402408..d9d5696 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -59,6 +59,16 @@
 # define VIRSH_CMD_GRP_HOST_AND_HV      "Host and Hypervisor"
 # define VIRSH_CMD_GRP_VIRSH            "Virsh itself"
 
+/*
+ * Common command options
+ */
+# define VIRSH_COMMON_OPT_POOL                                \
+    {.name = "pool",                                          \
+     .type = VSH_OT_DATA,                                     \
+     .flags = VSH_OFLAG_REQ,                                  \
+     .help = N_("pool name or uuid")                          \
+    }                                                         \
+
 typedef struct _virshControl virshControl;
 typedef virshControl *virshControlPtr;
 
-- 
2.5.0




More information about the libvir-list mailing list