From f9a6110f2669bed823a22727c2bc160daf665cc2 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Wed, 25 Nov 2015 09:35:41 -0500 Subject: [PATCH] virsh: Create macro for "overwrite" and no-overwrite" options Although not currently used in more than one command, it soon will be so create a common macro to be used in the new command location. Additionally, add the ".flags = 0," for both to match the expections of the structure being predefined. --- tools/virsh-pool.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 06f69d8178..5bce69fd5f 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -47,6 +47,20 @@ .help = N_("file containing an XML pool description") \ } \ +#define VSH_POOL_NO_OVERWRITE_OPT_COMMON \ + {.name = "no-overwrite", \ + .type = VSH_OT_BOOL, \ + .flags = 0, \ + .help = N_("do not overwrite an existing pool of this type") \ + } \ + +#define VSH_POOL_OVERWRITE_OPT_COMMON \ + {.name = "overwrite", \ + .type = VSH_OT_BOOL, \ + .flags = 0, \ + .help = N_("overwrite any existing data") \ + } \ + virStoragePoolPtr virshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, const char **name, unsigned int flags) @@ -506,15 +520,9 @@ static const vshCmdInfo info_pool_build[] = { static const vshCmdOptDef opts_pool_build[] = { VSH_POOL_OPT_COMMON, + VSH_POOL_NO_OVERWRITE_OPT_COMMON, + VSH_POOL_OVERWRITE_OPT_COMMON, - {.name = "no-overwrite", - .type = VSH_OT_BOOL, - .help = N_("do not overwrite an existing pool of this type") - }, - {.name = "overwrite", - .type = VSH_OT_BOOL, - .help = N_("overwrite any existing data") - }, {.name = NULL} }; -- GitLab