External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-09 23:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh-checkpoint: Make 'checkpointname' positional and required

Browse Source 
The argument was being parsed positionally due to the command parser
quirk as we didn't opt out of it.

Since the code in virshLookupCheckpoint requires that the checkpointname
is present we can mark all the options as positional and required and
remove the redundant check from virshLookupCheckpoint.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2024-03-14 16:56:16 +01:00
parent a7b10919e7
commit 627cf466f0
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/virsh-checkpoint.c
View File

@ -281,16 +281,8 @@ virshLookupCheckpoint(vshControl *ctl,
if (vshCommandOptStringReq(ctl, cmd, arg, &chkname) < 0) if (vshCommandOptStringReq(ctl, cmd, arg, &chkname) < 0)
return -1; return -1;
if (chkname) { if (!(*chk = virDomainCheckpointLookupByName(dom, chkname, 0)))
*chk = virDomainCheckpointLookupByName(dom, chkname, 0);
} else {
vshError(ctl, _("--%1$s is required"), arg);
return -1; return -1;
}
if (!*chk) {
vshReportError(ctl);
return -1;
}
*name = virDomainCheckpointGetName(*chk); *name = virDomainCheckpointGetName(*chk);
return 0; return 0;
@ -309,6 +301,8 @@ static const vshCmdOptDef opts_checkpoint_edit[] = {
VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_HAS_CHECKPOINT), VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_HAS_CHECKPOINT),
{.name = "checkpointname", {.name = "checkpointname",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.positional = true,
.required = true,
.help = N_("checkpoint name"), .help = N_("checkpoint name"),
.completer = virshCheckpointNameCompleter, .completer = virshCheckpointNameCompleter,
}, },
@ -420,6 +414,8 @@ static const vshCmdOptDef opts_checkpoint_info[] = {
VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_HAS_CHECKPOINT), VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_HAS_CHECKPOINT),
{.name = "checkpointname", {.name = "checkpointname",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.positional = true,
.required = true,
.help = N_("checkpoint name"), .help = N_("checkpoint name"),
.completer = virshCheckpointNameCompleter, .completer = virshCheckpointNameCompleter,
}, },
@ -810,6 +806,8 @@ static const vshCmdOptDef opts_checkpoint_dumpxml[] = {
VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_HAS_CHECKPOINT), VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_HAS_CHECKPOINT),
{.name = "checkpointname", {.name = "checkpointname",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.positional = true,
.required = true,
.help = N_("checkpoint name"), .help = N_("checkpoint name"),
.completer = virshCheckpointNameCompleter, .completer = virshCheckpointNameCompleter,
}, },
@ -886,6 +884,8 @@ static const vshCmdOptDef opts_checkpoint_parent[] = {
VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_HAS_CHECKPOINT), VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_HAS_CHECKPOINT),
{.name = "checkpointname", {.name = "checkpointname",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.positional = true,
.required = true,
.help = N_("find parent of checkpoint name"), .help = N_("find parent of checkpoint name"),
.completer = virshCheckpointNameCompleter, .completer = virshCheckpointNameCompleter,
}, },
@ -935,6 +935,8 @@ static const vshCmdOptDef opts_checkpoint_delete[] = {
VIR_CONNECT_LIST_DOMAINS_ACTIVE), VIR_CONNECT_LIST_DOMAINS_ACTIVE),
{.name = "checkpointname", {.name = "checkpointname",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.positional = true,
.required = true,
.help = N_("checkpoint name"), .help = N_("checkpoint name"),
.completer = virshCheckpointNameCompleter, .completer = virshCheckpointNameCompleter,
}, },