External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Expand VIRSH_COMMON_OPT_FILE for cases when it's not a local file used by virsh

Browse Source 
In cases such as the APIs for managed save management, the file path
provided via the '--file' option is passed to the API.

We'll need to make them distinct from cases for when virsh is using the
file so that different completers can be used.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-09-16 13:03:02 +02:00
parent 119b139c76
commit bc4739ed77
3 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tools/virsh-domain.c
View File

@ -4129,7 +4129,11 @@ static const vshCmdInfo info_save[] = {
static const vshCmdOptDef opts_save[] = { static const vshCmdOptDef opts_save[] = {
VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE),
VIRSH_COMMON_OPT_FILE(N_("where to save the data")), {.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("where to save the data")
},
{.name = "bypass-cache", {.name = "bypass-cache",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("avoid file system cache when saving") .help = N_("avoid file system cache when saving")
@ -4474,7 +4478,11 @@ static const vshCmdInfo info_save_image_dumpxml[] = {
}; };
static const vshCmdOptDef opts_save_image_dumpxml[] = { static const vshCmdOptDef opts_save_image_dumpxml[] = {
VIRSH_COMMON_OPT_FILE(N_("saved state file to read")), {.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("saved state file to read")
},
{.name = "security-info", {.name = "security-info",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("include security sensitive information in XML dump") .help = N_("include security sensitive information in XML dump")
@ -4518,7 +4526,11 @@ static const vshCmdInfo info_save_image_define[] = {
}; };
static const vshCmdOptDef opts_save_image_define[] = { static const vshCmdOptDef opts_save_image_define[] = {
VIRSH_COMMON_OPT_FILE(N_("saved state file to modify")), {.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("saved state file to modify")
},
{.name = "xml", {.name = "xml",
.type = VSH_OT_DATA, .type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ, .flags = VSH_OFLAG_REQ,
@ -4581,7 +4593,11 @@ static const vshCmdInfo info_save_image_edit[] = {
}; };
static const vshCmdOptDef opts_save_image_edit[] = { static const vshCmdOptDef opts_save_image_edit[] = {
VIRSH_COMMON_OPT_FILE(N_("saved state file to edit")), {.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("saved state file to edit")
},
{.name = "running", {.name = "running",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("set domain to be running on restore") .help = N_("set domain to be running on restore")
@ -5222,7 +5238,11 @@ static const vshCmdInfo info_restore[] = {
}; };
static const vshCmdOptDef opts_restore[] = { static const vshCmdOptDef opts_restore[] = {
VIRSH_COMMON_OPT_FILE(N_("the state to restore")), {.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("the state to restore")
},
{.name = "bypass-cache", {.name = "bypass-cache",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("avoid file system cache when restoring") .help = N_("avoid file system cache when restoring")
@ -5294,7 +5314,11 @@ static const vshCmdInfo info_dump[] = {
static const vshCmdOptDef opts_dump[] = { static const vshCmdOptDef opts_dump[] = {
VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE),
VIRSH_COMMON_OPT_FILE(N_("where to dump the core")), {.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("where to dump the core")
},
VIRSH_COMMON_OPT_LIVE(N_("perform a live core dump if supported")), VIRSH_COMMON_OPT_LIVE(N_("perform a live core dump if supported")),
{.name = "crash", {.name = "crash",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,

6
tools/virsh-volume.c
View File

@ -775,7 +775,11 @@ static const vshCmdInfo info_vol_download[] = {
static const vshCmdOptDef opts_vol_download[] = { static const vshCmdOptDef opts_vol_download[] = {
VIRSH_COMMON_OPT_VOL_FULL, VIRSH_COMMON_OPT_VOL_FULL,
VIRSH_COMMON_OPT_FILE(N_("file")), {.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
.help = N_("file")
},
VIRSH_COMMON_OPT_POOL_OPTIONAL, VIRSH_COMMON_OPT_POOL_OPTIONAL,
{.name = "offset", {.name = "offset",
.type = VSH_OT_INT, .type = VSH_OT_INT,

1
tools/virsh.h
View File

@ -95,6 +95,7 @@
.help = _helpstr \ .help = _helpstr \
} }
/* Use this only for files which are existing and used locally by virsh */
#define VIRSH_COMMON_OPT_FILE(_helpstr) \ #define VIRSH_COMMON_OPT_FILE(_helpstr) \
{.name = "file", \ {.name = "file", \
.type = VSH_OT_DATA, \ .type = VSH_OT_DATA, \