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@xxxxxxxxxx> --- 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 b8b37e4..1a71cb7 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_POOL_OPT_COMMON \ - {.name = "pool", \ - .type = VSH_OT_DATA, \ - .flags = VSH_OFLAG_REQ, \ - .help = N_("pool name or uuid") \ - } \ - #define VIRSH_POOL_FILE_OPT_COMMON \ {.name = "file", \ .type = VSH_OT_DATA, \ diff --git a/tools/virsh.h b/tools/virsh.h index 1845b0e..c1a1866 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_POOL_OPT_COMMON \ + {.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 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list