External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Create macros for common "vol" options

Browse Source 
Rather than continually cut-n-paste the strings into each command,
create common macros to be used generically.  Replace the more commonly
used "vol" option with a macro. This also adjusts 2 commands that
didn't have the correct helpstr - 'vol-create-from' and 'vol-clone'.
Both are described in the man page as taking vol, path, or key and
the code uses the virshCommandOptVol instead of virshCommandOptVolBy.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-01-09 08:36:31 -05:00
parent febf69b5e9
commit 5b436359a8
1 changed files with 16 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
tools/virsh-volume.c
View File

@ -54,6 +54,13 @@
.help = N_("pool name or uuid") \ .help = N_("pool name or uuid") \
} \ } \
#define VIRSH_COMMON_OPT_VOLUME_VOL \
{.name = "vol", \
.type = VSH_OT_DATA, \
.flags = VSH_OFLAG_REQ, \
.help = N_("vol name, key or path") \
} \
virStorageVolPtr virStorageVolPtr
virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,
const char *optname, const char *optname,
@ -425,11 +432,7 @@ static const vshCmdInfo info_vol_create_from[] = {
static const vshCmdOptDef opts_vol_create_from[] = { static const vshCmdOptDef opts_vol_create_from[] = {
VIRSH_COMMON_OPT_POOL_FULL, VIRSH_COMMON_OPT_POOL_FULL,
VIRSH_COMMON_OPT_FILE(N_("file containing an XML vol description")), VIRSH_COMMON_OPT_FILE(N_("file containing an XML vol description")),
{.name = "vol", VIRSH_COMMON_OPT_VOLUME_VOL,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("input vol name or key")
},
{.name = "inputpool", {.name = "inputpool",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.help = N_("pool name or uuid of the input volume's pool") .help = N_("pool name or uuid of the input volume's pool")
@ -540,11 +543,7 @@ static const vshCmdInfo info_vol_clone[] = {
}; };
static const vshCmdOptDef opts_vol_clone[] = { static const vshCmdOptDef opts_vol_clone[] = {
{.name = "vol", VIRSH_COMMON_OPT_VOLUME_VOL,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("orig vol name or key")
},
{.name = "newname", {.name = "newname",
.type = VSH_OT_DATA, .type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ, .flags = VSH_OFLAG_REQ,
@ -640,11 +639,7 @@ static const vshCmdInfo info_vol_upload[] = {
}; };
static const vshCmdOptDef opts_vol_upload[] = { static const vshCmdOptDef opts_vol_upload[] = {
{.name = "vol", VIRSH_COMMON_OPT_VOLUME_VOL,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("vol name, key or path")
},
VIRSH_COMMON_OPT_FILE(N_("file")), VIRSH_COMMON_OPT_FILE(N_("file")),
VIRSH_COMMON_OPT_POOL_OPTIONAL, VIRSH_COMMON_OPT_POOL_OPTIONAL,
{.name = "offset", {.name = "offset",
@ -747,11 +742,7 @@ static const vshCmdInfo info_vol_download[] = {
}; };
static const vshCmdOptDef opts_vol_download[] = { static const vshCmdOptDef opts_vol_download[] = {
{.name = "vol", VIRSH_COMMON_OPT_VOLUME_VOL,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("vol name, key or path")
},
VIRSH_COMMON_OPT_FILE(N_("file")), VIRSH_COMMON_OPT_FILE(N_("file")),
VIRSH_COMMON_OPT_POOL_OPTIONAL, VIRSH_COMMON_OPT_POOL_OPTIONAL,
{.name = "offset", {.name = "offset",
@ -853,11 +844,7 @@ static const vshCmdInfo info_vol_delete[] = {
}; };
static const vshCmdOptDef opts_vol_delete[] = { static const vshCmdOptDef opts_vol_delete[] = {
{.name = "vol", VIRSH_COMMON_OPT_VOLUME_VOL,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("vol name, key or path")
},
VIRSH_COMMON_OPT_POOL_OPTIONAL, VIRSH_COMMON_OPT_POOL_OPTIONAL,
{.name = "delete-snapshots", {.name = "delete-snapshots",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
@ -907,11 +894,7 @@ static const vshCmdInfo info_vol_wipe[] = {
}; };
static const vshCmdOptDef opts_vol_wipe[] = { static const vshCmdOptDef opts_vol_wipe[] = {
{.name = "vol", VIRSH_COMMON_OPT_VOLUME_VOL,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("vol name, key or path")
},
VIRSH_COMMON_OPT_POOL_OPTIONAL, VIRSH_COMMON_OPT_POOL_OPTIONAL,
{.name = "algorithm", {.name = "algorithm",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
@ -997,11 +980,7 @@ static const vshCmdInfo info_vol_info[] = {
}; };
static const vshCmdOptDef opts_vol_info[] = { static const vshCmdOptDef opts_vol_info[] = {
{.name = "vol", VIRSH_COMMON_OPT_VOLUME_VOL,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("vol name, key or path")
},
VIRSH_COMMON_OPT_POOL_OPTIONAL, VIRSH_COMMON_OPT_POOL_OPTIONAL,
{.name = NULL} {.name = NULL}
}; };
@ -1052,11 +1031,7 @@ static const vshCmdInfo info_vol_resize[] = {
}; };
static const vshCmdOptDef opts_vol_resize[] = { static const vshCmdOptDef opts_vol_resize[] = {
{.name = "vol", VIRSH_COMMON_OPT_VOLUME_VOL,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("vol name, key or path")
},
{.name = "capacity", {.name = "capacity",
.type = VSH_OT_DATA, .type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ, .flags = VSH_OFLAG_REQ,
@ -1153,11 +1128,7 @@ static const vshCmdInfo info_vol_dumpxml[] = {
}; };
static const vshCmdOptDef opts_vol_dumpxml[] = { static const vshCmdOptDef opts_vol_dumpxml[] = {
{.name = "vol", VIRSH_COMMON_OPT_VOLUME_VOL,
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("vol name, key or path")
},
VIRSH_COMMON_OPT_POOL_OPTIONAL, VIRSH_COMMON_OPT_POOL_OPTIONAL,
{.name = NULL} {.name = NULL}
}; };