[PATCH 00/23] vsh: Fix handling of commands and help - part 1 (help text formatter and flags)
This series refactors the cruft in the virsh command and argument handling so that handling of options and the flags for them make actually sense. Except for the 'timeout' parameter of 'daemon-timeout' 'virt-admin' command the behaviour is supposed to be identical. Peter Krempa (23): vsh: Always assume that command groups are used vsh: Don't translate error messages for 'self-test' vsh: Add VSH_OT_NONE option type to catch programming errors vsh: Remove VSH_CMD_FLAG_ALIAS vshCmddefCheckInternals: Fix listing of missing completers for 'VSH_OT_ARGV' virsh: Remove uncommon redundant descriptions of virsh commands virt-admin: Drop trailing whitespaces from description of some commands virsh-domain: Don't explicitly break lines in help vsh: Add '--dump-help' option for 'self-test' command vsh: Refactor store of command help and description vshCmddefHelp: Refactor printing of help (list of arguments) vshCmddefHelp: Refactor printing of help (argument description) vshCmddefGetOption: Improve readability virsh: Inline only use of VIRSH_COMMON_OPT_DOMAIN_OT_ARGV macro vsh: Annotate 'required' and 'positional' arguments explicitly vsh: Fix broken assumption that required VSH_OT_INT must be positional vsh: Require that positional non-argv arguments are required vshCmddefCheckInternals: Remove refactoring safety checks vshCmdGrpHelp: Refactor formatting of help for VSH_OT_ARGV vshCmddefHelp: Refactor and fix printing of help for _STRING/_INT arguments vsh: Replace VSH_OT_DATA by VSH_OT_STRING vsh: remove VSH_OFLAG_REQ vsh: Automatically calculate VSH_OFLAG_REQ_OPT tools/virsh-backup.c | 29 +- tools/virsh-checkpoint.c | 109 +-- tools/virsh-domain-event.c | 13 +- tools/virsh-domain-monitor.c | 207 ++-- tools/virsh-domain.c | 1783 ++++++++++++---------------------- tools/virsh-host.c | 311 ++---- tools/virsh-interface.c | 217 ++--- tools/virsh-network.c | 312 ++---- tools/virsh-nodedev.c | 242 ++--- tools/virsh-nwfilter.c | 144 +-- tools/virsh-pool.c | 296 ++---- tools/virsh-secret.c | 113 +-- tools/virsh-snapshot.c | 137 +-- tools/virsh-volume.c | 241 ++--- tools/virsh.c | 22 +- tools/virsh.h | 29 +- tools/virt-admin.c | 275 ++---- tools/vsh.c | 474 +++++---- tools/vsh.h | 49 +- 19 files changed, 1798 insertions(+), 3205 deletions(-) -- 2.44.0
None of the clients use the 'command set' approach and other pieces of code such as the command validator already assume that command groups are in use. Remove the unused 'command set' stuff. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh.c | 2 +- tools/virt-admin.c | 2 +- tools/vsh.c | 38 +++++++------------------------------- tools/vsh.h | 2 +- 4 files changed, 10 insertions(+), 34 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 95ff63baeb..18cd279aba 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -878,7 +878,7 @@ main(int argc, char **argv) virFileActivateDirOverrideForProg(argv[0]); - if (!vshInit(ctl, cmdGroups, NULL)) + if (!vshInit(ctl, cmdGroups)) exit(EXIT_FAILURE); if (!virshParseArgv(ctl, argc, argv) || diff --git a/tools/virt-admin.c b/tools/virt-admin.c index aaf6edb9a9..f551b33c4b 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1594,7 +1594,7 @@ main(int argc, char **argv) virFileActivateDirOverrideForProg(argv[0]); - if (!vshInit(ctl, cmdGroups, NULL)) + if (!vshInit(ctl, cmdGroups)) exit(EXIT_FAILURE); if (!vshAdmParseArgv(ctl, argc, argv) || diff --git a/tools/vsh.c b/tools/vsh.c index 65deaa77e8..0c41e9cfe8 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -56,7 +56,6 @@ vshControl *autoCompleteOpaque; * and only relies on static data accessible from the user-side callback */ const vshCmdGrp *cmdGroups; -const vshCmdDef *cmdSet; double @@ -572,8 +571,8 @@ vshCommandCheckOpts(vshControl *ctl, const vshCmd *cmd, uint64_t opts_required, return -1; } -static const vshCmdDef * -vshCmdDefSearchGrp(const char *cmdname) +const vshCmdDef * +vshCmddefSearch(const char *cmdname) { const vshCmdGrp *g; const vshCmdDef *c; @@ -588,28 +587,6 @@ vshCmdDefSearchGrp(const char *cmdname) return NULL; } -static const vshCmdDef * -vshCmdDefSearchSet(const char *cmdname) -{ - const vshCmdDef *s; - - for (s = cmdSet; s->name; s++) { - if (STREQ(s->name, cmdname)) - return s; - } - - return NULL; -} - -const vshCmdDef * -vshCmddefSearch(const char *cmdname) -{ - if (cmdGroups) - return vshCmdDefSearchGrp(cmdname); - else - return vshCmdDefSearchSet(cmdname); -} - const vshCmdGrp * vshCmdGrpSearch(const char *grpname) { @@ -3012,20 +2989,19 @@ vshInitDebug(vshControl *ctl) * Initialize global data */ bool -vshInit(vshControl *ctl, const vshCmdGrp *groups, const vshCmdDef *set) +vshInit(vshControl *ctl, const vshCmdGrp *groups) { if (!ctl->hooks) { vshError(ctl, "%s", _("client hooks cannot be NULL")); return false; } - if (!groups && !set) { - vshError(ctl, "%s", _("command groups and command set cannot both be NULL")); + if (!groups) { + vshError(ctl, "%s", _("command groups must be non-NULL")); return false; } cmdGroups = groups; - cmdSet = set; if (vshInitDebug(ctl) < 0 || (ctl->imode && vshReadlineInit(ctl) < 0)) @@ -3037,8 +3013,8 @@ vshInit(vshControl *ctl, const vshCmdGrp *groups, const vshCmdDef *set) bool vshInitReload(vshControl *ctl) { - if (!cmdGroups && !cmdSet) { - vshError(ctl, "%s", _("command groups and command are both NULL run vshInit before reloading")); + if (!cmdGroups) { + vshError(ctl, "%s", _("command groups is NULL run vshInit before reloading")); return false; } diff --git a/tools/vsh.h b/tools/vsh.h index 2a1be29b1c..17d7f08dc9 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -310,7 +310,7 @@ void vshPrint(vshControl *ctl, const char *format, ...) G_GNUC_PRINTF(2, 3); void vshPrintExtra(vshControl *ctl, const char *format, ...) G_GNUC_PRINTF(2, 3); -bool vshInit(vshControl *ctl, const vshCmdGrp *groups, const vshCmdDef *set); +bool vshInit(vshControl *ctl, const vshCmdGrp *groups); bool vshInitReload(vshControl *ctl); void vshDeinit(vshControl *ctl); void vshDebug(vshControl *ctl, int level, const char *format, ...) -- 2.44.0
On Mon, Mar 11, 2024 at 12:30:38 +0100, Peter Krempa wrote:
None of the clients use the 'command set' approach and other pieces of code such as the command validator already assume that command groups are in use. Remove the unused 'command set' stuff.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh.c | 2 +- tools/virt-admin.c | 2 +- tools/vsh.c | 38 +++++++------------------------------- tools/vsh.h | 2 +- 4 files changed, 10 insertions(+), 34 deletions(-)
The compiler on mingw started thinking after this patch that it sees a potential NULL dereference. To avoid that (while it's impossible as we check the assumptions which would make the command lookup function return NULL) I'll be squashing in the following to silence it: diff --git a/tools/vsh.c b/tools/vsh.c index cbd0d88078..7a8e9f7f8c 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1402,7 +1402,11 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) if (cmd->flags & VSH_CMD_FLAG_ALIAS) { VIR_FREE(tkdata); tkdata = g_strdup(cmd->alias); - cmd = vshCmddefSearch(tkdata); + if (!(cmd = vshCmddefSearch(tkdata))) { + /* self-test ensures that the alias exists */ + vshError(ctl, _("unknown command: '%1$s'"), tkdata); + goto syntaxError; + } } vshCmddefOptParse(cmd, &opts_need_arg, &opts_required); @@ -1527,7 +1531,10 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) if (STRNEQ(tmpopt->def->name, "help")) continue; - help = vshCmddefSearch("help"); + /* the self-test code ensures that help exists */ + if (!(help = vshCmddefSearch("help"))) + break; + vshCommandOptFree(first); first = g_new0(vshCmdOpt, 1); first->def = help->opts; @@ -3132,6 +3139,9 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) if ((def = vshCmddefSearch(name))) { if (def->flags & VSH_CMD_FLAG_ALIAS) def = vshCmddefSearch(def->alias); + } + + if (def) { return vshCmddefHelp(def); } else if ((grp = vshCmdGrpSearch(name))) { return vshCmdGrpHelp(ctl, grp);
The command invoking the code is internal and meant for developers, there's no point in translating the errors. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 0c41e9cfe8..61e302f9c8 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -255,7 +255,8 @@ vshCmddefGetInfo(const vshCmdDef * cmd, const char *name) return NULL; } -/* Check if the internal command definitions are correct */ +/* Check if the internal command definitions are correct. + * None of the errors are to be marked as translatable. */ static int vshCmddefCheckInternals(vshControl *ctl, const vshCmdDef *cmd, @@ -271,39 +272,39 @@ vshCmddefCheckInternals(vshControl *ctl, const vshCmdDef *alias; if (!cmd->alias) { - vshError(ctl, _("command '%1$s' has inconsistent alias"), cmd->name); + vshError(ctl, "command '%s' has inconsistent alias", cmd->name); return -1; } if (!(alias = vshCmddefSearch(cmd->alias))) { - vshError(ctl, _("command alias '%1$s' is pointing to a non-existent command '%2$s'"), + vshError(ctl, "command alias '%s' is pointing to a non-existent command '%s'", cmd->name, cmd->alias); return -1; } if (alias->flags & VSH_CMD_FLAG_ALIAS) { - vshError(ctl, _("command alias '%1$s' is pointing to another command alias '%2$s'"), + vshError(ctl, "command alias '%s' is pointing to another command alias '%s'", cmd->name, cmd->alias); return -1; } if (cmd->handler) { - vshError(ctl, _("command '%1$s' has handler set"), cmd->name); + vshError(ctl, "command '%s' has handler set", cmd->name); return -1; } if (cmd->opts) { - vshError(ctl, _("command '%1$s' has options set"), cmd->name); + vshError(ctl, "command '%s' has options set", cmd->name); return -1; } if (cmd->info) { - vshError(ctl, _("command '%1$s' has info set"), cmd->name); + vshError(ctl, "command '%s' has info set", cmd->name); return -1; } if (cmd->flags & ~VSH_CMD_FLAG_ALIAS) { - vshError(ctl, _("command '%1$s' has multiple flags set"), cmd->name); + vshError(ctl, "command '%s' has multiple flags set", cmd->name); return -1; } @@ -313,7 +314,7 @@ vshCmddefCheckInternals(vshControl *ctl, /* Each command has to provide a non-empty help string. */ if (!(help = vshCmddefGetInfo(cmd, "help")) || !*help) { - vshError(ctl, _("command '%1$s' lacks help"), cmd->name); + vshError(ctl, "command '%s' lacks help", cmd->name); return -1; } @@ -324,7 +325,7 @@ vshCmddefCheckInternals(vshControl *ctl, const vshCmdOptDef *opt = &cmd->opts[i]; if (i > 63) { - vshError(ctl, _("command '%1$s' has too many options"), cmd->name); + vshError(ctl, "command '%s' has too many options", cmd->name); return -1; /* too many options */ } @@ -336,7 +337,7 @@ vshCmddefCheckInternals(vshControl *ctl, switch (opt->type) { case VSH_OT_BOOL: if (opt->completer || opt->completer_flags) { - vshError(ctl, _("bool parameter '%1$s' of command '%2$s' has completer set"), + vshError(ctl, "bool parameter '%s' of command '%s' has completer set", opt->name, cmd->name); return -1; } @@ -345,7 +346,7 @@ vshCmddefCheckInternals(vshControl *ctl, case VSH_OT_STRING: if (opt->flags & VSH_OFLAG_REQ) { - vshError(ctl, _("parameter '%1$s' of command '%2$s' misused VSH_OFLAG_REQ"), + vshError(ctl, "parameter '%s' of command '%s' misused VSH_OFLAG_REQ", opt->name, cmd->name); return -1; /* neither bool nor string options can be mandatory */ } @@ -359,9 +360,9 @@ vshCmddefCheckInternals(vshControl *ctl, char *p; if (opt->flags || !opt->help) { - vshError(ctl, _("parameter '%1$s' of command '%2$s' has incorrect alias option"), + vshError(ctl, "parameter '%s' of command '%s' has incorrect alias option", opt->name, cmd->name); - return -1; /* alias options are tracked by the original name */ + return -1; } if ((p = strchr(opt->help, '='))) name = g_strndup(opt->help, p - opt->help); @@ -375,46 +376,46 @@ vshCmddefCheckInternals(vshControl *ctl, if (p) { /* If alias comes with value, replacement must not be bool */ if (cmd->opts[j].type == VSH_OT_BOOL) { - vshError(ctl, _("alias '%1$s' of command '%2$s' has mismatched alias type"), + vshError(ctl, "alias '%s' of command '%s' has mismatched alias type", opt->name, cmd->name); return -1; } } if (!cmd->opts[j].name) { - vshError(ctl, _("alias '%1$s' of command '%2$s' has missing alias option"), + vshError(ctl, "alias '%s' of command '%s' has missing alias option", opt->name, cmd->name); - return -1; /* alias option must map to a later option name */ + return -1; } } break; case VSH_OT_ARGV: if (cmd->opts[i + 1].name) { - vshError(ctl, _("parameter '%1$s' of command '%2$s' must be listed last"), + vshError(ctl, "parameter '%s' of command '%s' must be listed last", opt->name, cmd->name); - return -1; /* argv option must be listed last */ + return -1; } break; case VSH_OT_DATA: if (!(opt->flags & VSH_OFLAG_REQ)) { - vshError(ctl, _("parameter '%1$s' of command '%2$s' must use VSH_OFLAG_REQ flag"), + vshError(ctl, "parameter '%s' of command '%s' must use VSH_OFLAG_REQ flag", opt->name, cmd->name); - return -1; /* OT_DATA should always be required. */ + return -1; } if (seenOptionalOption) { - vshError(ctl, _("parameter '%1$s' of command '%2$s' must be listed before optional parameters"), + vshError(ctl, "parameter '%s' of command '%s' must be listed before optional parameters", opt->name, cmd->name); - return -1; /* mandatory options must be listed first */ + return -1; } break; case VSH_OT_INT: if (opt->flags & VSH_OFLAG_REQ) { if (seenOptionalOption) { - vshError(ctl, _("parameter '%1$s' of command '%2$s' must be listed before optional parameters"), + vshError(ctl, "parameter '%s' of command '%s' must be listed before optional parameters", opt->name, cmd->name); - return -1; /* mandatory options must be listed first */ + return -1; } } else { seenOptionalOption = true; -- 2.44.0
On a Monday in 2024, Peter Krempa wrote:
The command invoking the code is internal and meant for developers, there's no point in translating the errors.
I would have expected this change to trigger syntax-check errors, but it seems we stopped checking for vshError translations back in 2008: commit 513bd04ce1d443cbaba9acbfcf6865746c4f513a Mark many more strings for translation.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
On Tue, Mar 12, 2024 at 05:41:15PM +0100, Ján Tomko wrote:
On a Monday in 2024, Peter Krempa wrote:
The command invoking the code is internal and meant for developers, there's no point in translating the errors.
I would have expected this change to trigger syntax-check errors, but it seems we stopped checking for vshError translations back in 2008: commit 513bd04ce1d443cbaba9acbfcf6865746c4f513a Mark many more strings for translation.
That's surely a mistake in the regex refactoring we should fix ?
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Jano
_______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org
With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Add a check that the default 0 assignment will not mean that an option is considered to be VSH_OT_BOOL. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 7 +++++++ tools/vsh.h | 1 + 2 files changed, 8 insertions(+) diff --git a/tools/vsh.c b/tools/vsh.c index 61e302f9c8..a3491695b9 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -335,6 +335,11 @@ vshCmddefCheckInternals(vshControl *ctl, virBufferStrcat(&complbuf, opt->name, ", ", NULL); switch (opt->type) { + case VSH_OT_NONE: + vshError(ctl, "invalid type 'NONE' of option '%s' of command '%s'", + opt->name, cmd->name); + return -1; + case VSH_OT_BOOL: if (opt->completer || opt->completer_flags) { vshError(ctl, "bool parameter '%s' of command '%s' has completer set", @@ -671,6 +676,7 @@ vshCmddefHelp(const vshCmdDef *def) } break; case VSH_OT_ALIAS: + case VSH_OT_NONE: /* aliases are intentionally undocumented */ continue; } @@ -713,6 +719,7 @@ vshCmddefHelp(const vshCmdDef *def) opt->name); break; case VSH_OT_ALIAS: + case VSH_OT_NONE: continue; } diff --git a/tools/vsh.h b/tools/vsh.h index 17d7f08dc9..2cc0a62d3f 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -85,6 +85,7 @@ typedef enum { * vshCmdOptType - command option type */ typedef enum { + VSH_OT_NONE = 0, /* cannary to catch programming errors */ VSH_OT_BOOL, /* optional boolean option */ VSH_OT_STRING, /* optional string option */ VSH_OT_INT, /* optional or mandatory int option */ -- 2.44.0
It's obvious that a command is an alias when the 'alias' property is set, thus an extra flag is redundant. Remove it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh-nodedev.c | 1 - tools/virsh.c | 2 +- tools/virt-admin.c | 9 +-------- tools/vsh.c | 21 ++++++++------------- tools/vsh.h | 3 +-- 5 files changed, 11 insertions(+), 25 deletions(-) diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index c08de65a96..b5a88b194f 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -1415,7 +1415,6 @@ const vshCmdDef nodedevCmds[] = { .flags = 0 }, {.name = "nodedev-dettach", - .flags = VSH_CMD_FLAG_ALIAS, .alias = "nodedev-detach" }, {.name = "nodedev-dumpxml", diff --git a/tools/virsh.c b/tools/virsh.c index 18cd279aba..0d860d0390 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -460,7 +460,7 @@ virshUsage(void) fprintf(stdout, _(" %1$s (help keyword '%2$s')\n"), grp->name, grp->keyword); for (cmd = grp->commands; cmd->name; cmd++) { - if (cmd->flags & VSH_CMD_FLAG_ALIAS || + if (cmd->alias || cmd->flags & VSH_CMD_FLAG_HIDDEN) continue; fprintf(stdout, diff --git a/tools/virt-admin.c b/tools/virt-admin.c index f551b33c4b..27bd123bfe 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1262,7 +1262,7 @@ vshAdmUsage(void) fprintf(stdout, _(" %1$s (help keyword '%2$s')\n"), grp->name, grp->keyword); for (cmd = grp->commands; cmd->name; cmd++) { - if (cmd->flags & VSH_CMD_FLAG_ALIAS || + if (cmd->alias || cmd->flags & VSH_CMD_FLAG_HIDDEN) continue; fprintf(stdout, @@ -1429,7 +1429,6 @@ static const vshCmdDef vshAdmCmds[] = { static const vshCmdDef monitoringCmds[] = { {.name = "srv-list", - .flags = VSH_CMD_FLAG_ALIAS, .alias = "server-list" }, {.name = "server-list", @@ -1439,7 +1438,6 @@ static const vshCmdDef monitoringCmds[] = { .flags = 0 }, {.name = "srv-threadpool-info", - .flags = VSH_CMD_FLAG_ALIAS, .alias = "server-threadpool-info" }, {.name = "server-threadpool-info", @@ -1449,7 +1447,6 @@ static const vshCmdDef monitoringCmds[] = { .flags = 0 }, {.name = "srv-clients-list", - .flags = VSH_CMD_FLAG_ALIAS, .alias = "client-list" }, {.name = "client-list", @@ -1465,7 +1462,6 @@ static const vshCmdDef monitoringCmds[] = { .flags = 0 }, {.name = "srv-clients-info", - .flags = VSH_CMD_FLAG_ALIAS, .alias = "server-clients-info" }, {.name = "server-clients-info", @@ -1479,7 +1475,6 @@ static const vshCmdDef monitoringCmds[] = { static const vshCmdDef managementCmds[] = { {.name = "srv-threadpool-set", - .flags = VSH_CMD_FLAG_ALIAS, .alias = "server-threadpool-set" }, {.name = "server-threadpool-set", @@ -1495,7 +1490,6 @@ static const vshCmdDef managementCmds[] = { .flags = 0 }, {.name = "srv-clients-set", - .flags = VSH_CMD_FLAG_ALIAS, .alias = "server-clients-set" }, {.name = "server-clients-set", @@ -1505,7 +1499,6 @@ static const vshCmdDef managementCmds[] = { .flags = 0 }, {.name = "srv-update-tls", - .flags = VSH_CMD_FLAG_ALIAS, .alias = "server-update-tls" }, {.name = "server-update-tls", diff --git a/tools/vsh.c b/tools/vsh.c index a3491695b9..08a08bb227 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -268,21 +268,16 @@ vshCmddefCheckInternals(vshControl *ctl, g_auto(virBuffer) complbuf = VIR_BUFFER_INITIALIZER; /* in order to perform the validation resolve the alias first */ - if (cmd->flags & VSH_CMD_FLAG_ALIAS) { + if (cmd->alias) { const vshCmdDef *alias; - if (!cmd->alias) { - vshError(ctl, "command '%s' has inconsistent alias", cmd->name); - return -1; - } - if (!(alias = vshCmddefSearch(cmd->alias))) { vshError(ctl, "command alias '%s' is pointing to a non-existent command '%s'", cmd->name, cmd->alias); return -1; } - if (alias->flags & VSH_CMD_FLAG_ALIAS) { + if (alias->alias) { vshError(ctl, "command alias '%s' is pointing to another command alias '%s'", cmd->name, cmd->alias); return -1; @@ -303,7 +298,7 @@ vshCmddefCheckInternals(vshControl *ctl, return -1; } - if (cmd->flags & ~VSH_CMD_FLAG_ALIAS) { + if (cmd->flags != 0) { vshError(ctl, "command '%s' has multiple flags set", cmd->name); return -1; } @@ -615,7 +610,7 @@ vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp) grp->keyword); for (cmd = grp->commands; cmd->name; cmd++) { - if (cmd->flags & VSH_CMD_FLAG_ALIAS || + if (cmd->alias || cmd->flags & VSH_CMD_FLAG_HIDDEN) continue; vshPrint(ctl, " %-30s %s\n", cmd->name, @@ -1407,7 +1402,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) } /* aliases need to be resolved to the actual commands */ - if (cmd->flags & VSH_CMD_FLAG_ALIAS) { + if (cmd->alias) { VIR_FREE(tkdata); tkdata = g_strdup(cmd->alias); cmd = vshCmddefSearch(tkdata); @@ -2594,7 +2589,7 @@ vshReadlineCommandGenerator(void) for (cmd_list_index = 0; cmds[cmd_list_index].name; cmd_list_index++) { const char *name = cmds[cmd_list_index].name; - if (cmds[cmd_list_index].flags & VSH_CMD_FLAG_ALIAS || + if (cmds[cmd_list_index].alias || cmds[cmd_list_index].flags & VSH_CMD_FLAG_HIDDEN) continue; @@ -3095,7 +3090,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) grp->keyword); for (def = grp->commands; def->name; def++) { - if (def->flags & VSH_CMD_FLAG_ALIAS || + if (def->alias || def->flags & VSH_CMD_FLAG_HIDDEN) continue; vshPrint(ctl, " %-30s %s\n", def->name, @@ -3109,7 +3104,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) } if ((def = vshCmddefSearch(name))) { - if (def->flags & VSH_CMD_FLAG_ALIAS) + if (def->alias) def = vshCmddefSearch(def->alias); return vshCmddefHelp(def); } else if ((grp = vshCmdGrpSearch(name))) { diff --git a/tools/vsh.h b/tools/vsh.h index 2cc0a62d3f..a191b50c2d 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -162,8 +162,7 @@ struct _vshCmdOpt { */ enum { VSH_CMD_FLAG_NOCONNECT = (1 << 0), /* no prior connection needed */ - VSH_CMD_FLAG_ALIAS = (1 << 1), /* command is an alias */ - VSH_CMD_FLAG_HIDDEN = (1 << 2), /* command is hidden/internal */ + VSH_CMD_FLAG_HIDDEN = (1 << 1), /* command is hidden/internal */ }; /* -- 2.44.0
Use a switch statement to cover all cases and check for missing completers for arguments declared as VSH_OT_ARGV. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 08a08bb227..6e558e56df 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -324,10 +324,24 @@ vshCmddefCheckInternals(vshControl *ctl, return -1; /* too many options */ } - if (missingCompleters && - (opt->type == VSH_OT_STRING || opt->type == VSH_OT_DATA) && - !opt->completer) - virBufferStrcat(&complbuf, opt->name, ", ", NULL); + if (missingCompleters && !opt->completer) { + switch (opt->type) { + case VSH_OT_STRING: + case VSH_OT_DATA: + case VSH_OT_ARGV: + virBufferStrcat(&complbuf, opt->name, ", ", NULL); + break; + + case VSH_OT_BOOL: + /* only name is completed */ + case VSH_OT_INT: + /* no point in completing numbers */ + case VSH_OT_ALIAS: + /* alias is handled in the referenced command */ + case VSH_OT_NONE: + break; + } + } switch (opt->type) { case VSH_OT_NONE: -- 2.44.0
Some description of virsh commands referenced itself in a multi-line example of usage, which is pointless as virsh help already shows how to use the command: .data = N_("Get or set the current memory parameters for a guest" " domain.\n" " To get the memory parameters use following command: \n\n" " virsh # memtune <domain>") Change it to just state what the command does and leave the example for the help printer. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh-domain.c | 20 ++++---------------- tools/virsh-host.c | 4 +--- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d3e28f38f4..a90aefeb32 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1528,10 +1528,7 @@ static const vshCmdInfo info_blkiotune[] = { .data = N_("Get or set blkio parameters") }, {.name = "desc", - .data = N_("Get or set the current blkio parameters for a guest" - " domain.\n" - " To get the blkio parameters use following command: \n\n" - " virsh # blkiotune <domain>") + .data = N_("Get or set the current blkio parameters for a guest domain.") }, {.name = NULL} }; @@ -9257,10 +9254,7 @@ static const vshCmdInfo info_memtune[] = { .data = N_("Get or set memory parameters") }, {.name = "desc", - .data = N_("Get or set the current memory parameters for a guest" - " domain.\n" - " To get the memory parameters use following command: \n\n" - " virsh # memtune <domain>") + .data = N_("Get or set the current memory parameters for a guest domain.") }, {.name = NULL} }; @@ -9432,10 +9426,7 @@ static const vshCmdInfo info_perf[] = { .data = N_("Get or set perf event") }, {.name = "desc", - .data = N_("Get or set the current perf events for a guest" - " domain.\n" - " To get the perf events list use following command: \n\n" - " virsh # perf <domain>") + .data = N_("Get or set the current perf events for a guest domain.") }, {.name = NULL} }; @@ -9564,10 +9555,7 @@ static const vshCmdInfo info_numatune[] = { .data = N_("Get or set numa parameters") }, {.name = "desc", - .data = N_("Get or set the current numa parameters for a guest" - " domain.\n" - " To get the numa parameters use following command: \n\n" - " virsh # numatune <domain>") + .data = N_("Get or set the current numa parameters for a guest domain.") }, {.name = NULL} }; diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 90ff46c5c4..87443220bd 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1505,9 +1505,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) static const vshCmdInfo info_node_memory_tune[] = { {"help", N_("Get or set node memory parameters")}, - {"desc", N_("Get or set node memory parameters\n" - " To get the memory parameters, use following command: \n\n" - " virsh # node-memory-tune")}, + {"desc", N_("Get or set node memory parameters")}, {NULL, NULL} }; -- 2.44.0
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virt-admin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 27bd123bfe..32e0c82f36 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -376,7 +376,7 @@ static const vshCmdInfo info_srv_threadpool_info[] = { .data = N_("get server workerpool parameters") }, {.name = "desc", - .data = N_("Retrieve threadpool attributes from a server. ") + .data = N_("Retrieve threadpool attributes from a server.") }, {.name = NULL} }; @@ -784,7 +784,7 @@ static const vshCmdInfo info_srv_clients_info[] = { .data = N_("get server's client-related configuration limits") }, {.name = "desc", - .data = N_("Retrieve server's client-related configuration limits ") + .data = N_("Retrieve server's client-related configuration limits") }, {.name = NULL} }; -- 2.44.0
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a90aefeb32..e2764efc4a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9565,7 +9565,7 @@ static const vshCmdOptDef opts_numatune[] = { {.name = "mode", .type = VSH_OT_STRING, .completer = virshDomainNumatuneModeCompleter, - .help = N_("NUMA mode, one of strict, preferred and interleave \n" + .help = N_("NUMA mode, one of strict, preferred and interleave " "or a number from the virDomainNumatuneMemMode enum") }, {.name = "nodeset", -- 2.44.0
The new option dumps the full help outputs for every command so that it's possible to conveniently check that subsequent refactors will not impact any of the external functionality. No man page entry is needed as the command is internal/undocumented. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/vsh.c b/tools/vsh.c index 6e558e56df..55921a0759 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3312,6 +3312,10 @@ const vshCmdOptDef opts_selftest[] = { .type = VSH_OT_BOOL, .help = N_("output the list of options which are missing completers") }, + {.name = "dump-help", + .type = VSH_OT_BOOL, + .help = N_("output help for each command") + }, {.name = NULL} }; const vshCmdInfo info_selftest[] = { @@ -3330,9 +3334,14 @@ cmdSelfTest(vshControl *ctl, const vshCmd *cmd) const vshCmdGrp *grp; const vshCmdDef *def; bool completers = vshCommandOptBool(cmd, "completers-missing"); + bool dumphelp = vshCommandOptBool(cmd, "dump-help"); for (grp = cmdGroups; grp->name; grp++) { for (def = grp->commands; def->name; def++) { + + if (dumphelp && !def->alias) + vshCmddefHelp(def); + if (vshCmddefCheckInternals(ctl, def, completers) < 0) return false; } -- 2.44.0
Store the pointers to 'help' and 'description' information in the struct directly rather than in a key-value list. The generic approach never got any extra use. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh-backup.c | 28 +- tools/virsh-checkpoint.c | 108 +-- tools/virsh-domain-event.c | 13 +- tools/virsh-domain-monitor.c | 189 ++--- tools/virsh-domain.c | 1479 +++++++++++----------------------- tools/virsh-host.c | 288 +++---- tools/virsh-interface.c | 186 ++--- tools/virsh-network.c | 275 ++----- tools/virsh-nodedev.c | 190 ++--- tools/virsh-nwfilter.c | 117 +-- tools/virsh-pool.c | 275 ++----- tools/virsh-secret.c | 91 +-- tools/virsh-snapshot.c | 130 +-- tools/virsh-volume.c | 210 ++--- tools/virsh.c | 18 +- tools/virt-admin.c | 214 ++--- tools/vsh.c | 113 +-- tools/vsh.h | 38 +- 18 files changed, 1238 insertions(+), 2724 deletions(-) diff --git a/tools/virsh-backup.c b/tools/virsh-backup.c index 1bb2c63113..7a7834d7ff 100644 --- a/tools/virsh-backup.c +++ b/tools/virsh-backup.c @@ -24,15 +24,10 @@ /* * "backup-begin" command */ -static const vshCmdInfo info_backup_begin[] = { - {.name = "help", - .data = N_("Start a disk backup of a live domain") - }, - {.name = "desc", - .data = N_("Use XML to start a full or incremental disk backup of a live " - "domain, optionally creating a checkpoint") - }, - {.name = NULL} +static const vshCmdInfo info_backup_begin = { + .help = N_("Start a disk backup of a live domain"), + .desc = N_("Use XML to start a full or incremental disk backup of a live " + "domain, optionally creating a checkpoint"), }; static const vshCmdOptDef opts_backup_begin[] = { @@ -103,14 +98,9 @@ cmdBackupBegin(vshControl *ctl, /* * "backup-dumpxml" command */ -static const vshCmdInfo info_backup_dumpxml[] = { - {.name = "help", - .data = N_("Dump XML for an ongoing domain block backup job") - }, - {.name = "desc", - .data = N_("Backup Dump XML") - }, - {.name = NULL} +static const vshCmdInfo info_backup_dumpxml = { + .help = N_("Dump XML for an ongoing domain block backup job"), + .desc = N_("Backup Dump XML"), }; static const vshCmdOptDef opts_backup_dumpxml[] = { @@ -154,13 +144,13 @@ const vshCmdDef backupCmds[] = { {.name = "backup-begin", .handler = cmdBackupBegin, .opts = opts_backup_begin, - .info = info_backup_begin, + .info = &info_backup_begin, .flags = 0 }, {.name = "backup-dumpxml", .handler = cmdBackupDumpXML, .opts = opts_backup_dumpxml, - .info = info_backup_dumpxml, + .info = &info_backup_dumpxml, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index 34bae34f9a..869c071700 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -71,15 +71,10 @@ virshCheckpointCreate(vshControl *ctl, /* * "checkpoint-create" command */ -static const vshCmdInfo info_checkpoint_create[] = { - {.name = "help", - .data = N_("Create a checkpoint from XML") - }, - {.name = "desc", - .data = N_("Create a checkpoint from XML for use in " - "future incremental backups") - }, - {.name = NULL} +static const vshCmdInfo info_checkpoint_create = { + .help = N_("Create a checkpoint from XML"), + .desc = N_("Create a checkpoint from XML for use in " + "future incremental backups"), }; static const vshCmdOptDef opts_checkpoint_create[] = { @@ -183,15 +178,10 @@ virshParseCheckpointDiskspec(vshControl *ctl, return ret; } -static const vshCmdInfo info_checkpoint_create_as[] = { - {.name = "help", - .data = N_("Create a checkpoint from a set of args") - }, - {.name = "desc", - .data = N_("Create a checkpoint from arguments for use in " - "future incremental backups") - }, - {.name = NULL} +static const vshCmdInfo info_checkpoint_create_as = { + .help = N_("Create a checkpoint from a set of args"), + .desc = N_("Create a checkpoint from arguments for use in " + "future incremental backups"), }; static const vshCmdOptDef opts_checkpoint_create_as[] = { @@ -309,14 +299,9 @@ virshLookupCheckpoint(vshControl *ctl, /* * "checkpoint-edit" command */ -static const vshCmdInfo info_checkpoint_edit[] = { - {.name = "help", - .data = N_("edit XML for a checkpoint") - }, - {.name = "desc", - .data = N_("Edit the domain checkpoint XML for a named checkpoint") - }, - {.name = NULL} +static const vshCmdInfo info_checkpoint_edit = { + .help = N_("edit XML for a checkpoint"), + .desc = N_("Edit the domain checkpoint XML for a named checkpoint"), }; static const vshCmdOptDef opts_checkpoint_edit[] = { @@ -425,14 +410,9 @@ virshGetCheckpointParent(vshControl *ctl, /* * "checkpoint-info" command */ -static const vshCmdInfo info_checkpoint_info[] = { - {.name = "help", - .data = N_("checkpoint information") - }, - {.name = "desc", - .data = N_("Returns basic information about a checkpoint.") - }, - {.name = NULL} +static const vshCmdInfo info_checkpoint_info = { + .help = N_("checkpoint information"), + .desc = N_("Returns basic information about a checkpoint."), }; static const vshCmdOptDef opts_checkpoint_info[] = { @@ -623,14 +603,9 @@ virshCheckpointListLookup(int id, /* * "checkpoint-list" command */ -static const vshCmdInfo info_checkpoint_list[] = { - {.name = "help", - .data = N_("List checkpoints for a domain") - }, - {.name = "desc", - .data = N_("Checkpoint List") - }, - {.name = NULL} +static const vshCmdInfo info_checkpoint_list = { + .help = N_("List checkpoints for a domain"), + .desc = N_("Checkpoint List"), }; static const vshCmdOptDef opts_checkpoint_list[] = { @@ -825,14 +800,9 @@ cmdCheckpointList(vshControl *ctl, /* * "checkpoint-dumpxml" command */ -static const vshCmdInfo info_checkpoint_dumpxml[] = { - {.name = "help", - .data = N_("Dump XML for a domain checkpoint") - }, - {.name = "desc", - .data = N_("Checkpoint Dump XML") - }, - {.name = NULL} +static const vshCmdInfo info_checkpoint_dumpxml = { + .help = N_("Dump XML for a domain checkpoint"), + .desc = N_("Checkpoint Dump XML"), }; static const vshCmdOptDef opts_checkpoint_dumpxml[] = { @@ -906,14 +876,9 @@ cmdCheckpointDumpXML(vshControl *ctl, /* * "checkpoint-parent" command */ -static const vshCmdInfo info_checkpoint_parent[] = { - {.name = "help", - .data = N_("Get the name of the parent of a checkpoint") - }, - {.name = "desc", - .data = N_("Extract the checkpoint's parent, if any") - }, - {.name = NULL} +static const vshCmdInfo info_checkpoint_parent = { + .help = N_("Get the name of the parent of a checkpoint"), + .desc = N_("Extract the checkpoint's parent, if any"), }; static const vshCmdOptDef opts_checkpoint_parent[] = { @@ -959,14 +924,9 @@ cmdCheckpointParent(vshControl *ctl, /* * "checkpoint-delete" command */ -static const vshCmdInfo info_checkpoint_delete[] = { - {.name = "help", - .data = N_("Delete a domain checkpoint") - }, - {.name = "desc", - .data = N_("Checkpoint Delete") - }, - {.name = NULL} +static const vshCmdInfo info_checkpoint_delete = { + .help = N_("Delete a domain checkpoint"), + .desc = N_("Checkpoint Delete"), }; static const vshCmdOptDef opts_checkpoint_delete[] = { @@ -1034,49 +994,49 @@ const vshCmdDef checkpointCmds[] = { {.name = "checkpoint-create", .handler = cmdCheckpointCreate, .opts = opts_checkpoint_create, - .info = info_checkpoint_create, + .info = &info_checkpoint_create, .flags = 0 }, {.name = "checkpoint-create-as", .handler = cmdCheckpointCreateAs, .opts = opts_checkpoint_create_as, - .info = info_checkpoint_create_as, + .info = &info_checkpoint_create_as, .flags = 0 }, {.name = "checkpoint-delete", .handler = cmdCheckpointDelete, .opts = opts_checkpoint_delete, - .info = info_checkpoint_delete, + .info = &info_checkpoint_delete, .flags = 0 }, {.name = "checkpoint-dumpxml", .handler = cmdCheckpointDumpXML, .opts = opts_checkpoint_dumpxml, - .info = info_checkpoint_dumpxml, + .info = &info_checkpoint_dumpxml, .flags = 0 }, {.name = "checkpoint-edit", .handler = cmdCheckpointEdit, .opts = opts_checkpoint_edit, - .info = info_checkpoint_edit, + .info = &info_checkpoint_edit, .flags = 0 }, {.name = "checkpoint-info", .handler = cmdCheckpointInfo, .opts = opts_checkpoint_info, - .info = info_checkpoint_info, + .info = &info_checkpoint_info, .flags = 0 }, {.name = "checkpoint-list", .handler = cmdCheckpointList, .opts = opts_checkpoint_list, - .info = info_checkpoint_list, + .info = &info_checkpoint_list, .flags = 0 }, {.name = "checkpoint-parent", .handler = cmdCheckpointParent, .opts = opts_checkpoint_parent, - .info = info_checkpoint_parent, + .info = &info_checkpoint_parent, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-domain-event.c b/tools/virsh-domain-event.c index 6887c195a0..2ff7f7b81c 100644 --- a/tools/virsh-domain-event.c +++ b/tools/virsh-domain-event.c @@ -859,14 +859,9 @@ virshDomainEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, } -static const vshCmdInfo info_event[] = { - {.name = "help", - .data = N_("Domain Events") - }, - {.name = "desc", - .data = N_("List event types, or wait for domain events to occur") - }, - {.name = NULL} +static const vshCmdInfo info_event = { + .help = N_("Domain Events"), + .desc = N_("List event types, or wait for domain events to occur"), }; static const vshCmdOptDef opts_event[] = { @@ -1017,7 +1012,7 @@ const vshCmdDef domEventCmds[] = { {.name = "event", .handler = cmdEvent, .opts = opts_event, - .info = info_event, + .info = &info_event, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index a2c56fc090..277eb71342 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -268,14 +268,9 @@ virshDomainStateReasonToString(int state, int reason) /* * "dommemstat" command */ -static const vshCmdInfo info_dommemstat[] = { - {.name = "help", - .data = N_("get memory statistics for a domain") - }, - {.name = "desc", - .data = N_("Get memory statistics for a running domain.") - }, - {.name = NULL} +static const vshCmdInfo info_dommemstat = { + .help = N_("get memory statistics for a domain"), + .desc = N_("Get memory statistics for a running domain."), }; static const vshCmdOptDef opts_dommemstat[] = { @@ -381,14 +376,9 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) /* * "domblkinfo" command */ -static const vshCmdInfo info_domblkinfo[] = { - {.name = "help", - .data = N_("domain block device size information") - }, - {.name = "desc", - .data = N_("Get block device size info for a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_domblkinfo = { + .help = N_("domain block device size information"), + .desc = N_("Get block device size info for a domain."), }; static const vshCmdOptDef opts_domblkinfo[] = { @@ -545,14 +535,9 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) /* * "domblklist" command */ -static const vshCmdInfo info_domblklist[] = { - {.name = "help", - .data = N_("list all domain blocks") - }, - {.name = "desc", - .data = N_("Get the summary of block devices for a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_domblklist = { + .help = N_("list all domain blocks"), + .desc = N_("Get the summary of block devices for a domain."), }; static const vshCmdOptDef opts_domblklist[] = { @@ -666,10 +651,9 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) /* * "domiflist" command */ -static const vshCmdInfo info_domiflist[] = { - {"help", N_("list all domain virtual interfaces")}, - {"desc", N_("Get the summary of virtual interfaces for a domain.")}, - {NULL, NULL} +static const vshCmdInfo info_domiflist = { + .help = N_("list all domain virtual interfaces"), + .desc = N_("Get the summary of virtual interfaces for a domain."), }; static const vshCmdOptDef opts_domiflist[] = { @@ -745,14 +729,9 @@ cmdDomiflist(vshControl *ctl, const vshCmd *cmd) /* * "domif-getlink" command */ -static const vshCmdInfo info_domif_getlink[] = { - {.name = "help", - .data = N_("get link state of a virtual interface") - }, - {.name = "desc", - .data = N_("Get link state of a domain's virtual interface.") - }, - {.name = NULL} +static const vshCmdInfo info_domif_getlink = { + .help = N_("get link state of a virtual interface"), + .desc = N_("Get link state of a domain's virtual interface."), }; static const vshCmdOptDef opts_domif_getlink[] = { @@ -832,14 +811,9 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) /* * "domcontrol" command */ -static const vshCmdInfo info_domcontrol[] = { - {.name = "help", - .data = N_("domain control interface state") - }, - {.name = "desc", - .data = N_("Returns state of a control interface to the domain.") - }, - {.name = NULL} +static const vshCmdInfo info_domcontrol = { + .help = N_("domain control interface state"), + .desc = N_("Returns state of a control interface to the domain."), }; static const vshCmdOptDef opts_domcontrol[] = { @@ -879,15 +853,10 @@ cmdDomControl(vshControl *ctl, const vshCmd *cmd) /* * "domblkstat" command */ -static const vshCmdInfo info_domblkstat[] = { - {.name = "help", - .data = N_("get device block stats for a domain") - }, - {.name = "desc", - .data = N_("Get device block stats for a running domain. See man page or " - "use --human for explanation of fields") - }, - {.name = NULL} +static const vshCmdInfo info_domblkstat = { + .help = N_("get device block stats for a domain"), + .desc = N_("Get device block stats for a running domain. See man page or " + "use --human for explanation of fields"), }; static const vshCmdOptDef opts_domblkstat[] = { @@ -1060,14 +1029,9 @@ cmdDomblkstat(vshControl *ctl, const vshCmd *cmd) /* * "domifstat" command */ -static const vshCmdInfo info_domifstat[] = { - {.name = "help", - .data = N_("get network interface stats for a domain") - }, - {.name = "desc", - .data = N_("Get network interface stats for a running domain.") - }, - {.name = NULL} +static const vshCmdInfo info_domifstat = { + .help = N_("get network interface stats for a domain"), + .desc = N_("Get network interface stats for a running domain."), }; static const vshCmdOptDef opts_domifstat[] = { @@ -1129,14 +1093,9 @@ cmdDomIfstat(vshControl *ctl, const vshCmd *cmd) /* * "domblkerror" command */ -static const vshCmdInfo info_domblkerror[] = { - {.name = "help", - .data = N_("Show errors on block devices") - }, - {.name = "desc", - .data = N_("Show block device errors") - }, - {.name = NULL} +static const vshCmdInfo info_domblkerror = { + .help = N_("Show errors on block devices"), + .desc = N_("Show block device errors"), }; static const vshCmdOptDef opts_domblkerror[] = { @@ -1190,14 +1149,9 @@ cmdDomBlkError(vshControl *ctl, const vshCmd *cmd) /* * "dominfo" command */ -static const vshCmdInfo info_dominfo[] = { - {.name = "help", - .data = N_("domain information") - }, - {.name = "desc", - .data = N_("Returns basic information about the domain.") - }, - {.name = NULL} +static const vshCmdInfo info_dominfo = { + .help = N_("domain information"), + .desc = N_("Returns basic information about the domain."), }; static const vshCmdOptDef opts_dominfo[] = { @@ -1328,14 +1282,9 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) /* * "domstate" command */ -static const vshCmdInfo info_domstate[] = { - {.name = "help", - .data = N_("domain state") - }, - {.name = "desc", - .data = N_("Returns state about a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_domstate = { + .help = N_("domain state"), + .desc = N_("Returns state about a domain."), }; static const vshCmdOptDef opts_domstate[] = { @@ -1375,14 +1324,9 @@ cmdDomstate(vshControl *ctl, const vshCmd *cmd) /* * "domtime" command */ -static const vshCmdInfo info_domtime[] = { - {.name = "help", - .data = N_("domain time") - }, - {.name = "desc", - .data = N_("Gets or sets the domain's system time") - }, - {.name = NULL} +static const vshCmdInfo info_domtime = { + .help = N_("domain time"), + .desc = N_("Gets or sets the domain's system time"), }; static const vshCmdOptDef opts_domtime[] = { @@ -1471,14 +1415,9 @@ cmdDomTime(vshControl *ctl, const vshCmd *cmd) /* * "list" command */ -static const vshCmdInfo info_list[] = { - {.name = "help", - .data = N_("list domains") - }, - {.name = "desc", - .data = N_("Returns list of domains.") - }, - {.name = NULL} +static const vshCmdInfo info_list = { + .help = N_("list domains"), + .desc = N_("Returns list of domains."), }; /* compare domains, pack NULLed ones at the end */ @@ -2011,14 +1950,9 @@ cmdList(vshControl *ctl, const vshCmd *cmd) /* * "domstats" command */ -static const vshCmdInfo info_domstats[] = { - {.name = "help", - .data = N_("get statistics about one or multiple domains") - }, - {.name = "desc", - .data = N_("Gets statistics about one or more (or all) domains") - }, - {.name = NULL} +static const vshCmdInfo info_domstats = { + .help = N_("get statistics about one or multiple domains"), + .desc = N_("Gets statistics about one or more (or all) domains"), }; static const vshCmdOptDef opts_domstats[] = { @@ -2269,10 +2203,9 @@ cmdDomstats(vshControl *ctl, const vshCmd *cmd) /* "domifaddr" command */ -static const vshCmdInfo info_domifaddr[] = { - {"help", N_("Get network interfaces' addresses for a running domain")}, - {"desc", N_("Get network interfaces' addresses for a running domain")}, - {NULL, NULL} +static const vshCmdInfo info_domifaddr = { + .help = N_("Get network interfaces' addresses for a running domain"), + .desc = N_("Get network interfaces' addresses for a running domain"), }; static const vshCmdOptDef opts_domifaddr[] = { @@ -2401,91 +2334,91 @@ const vshCmdDef domMonitoringCmds[] = { {.name = "domblkerror", .handler = cmdDomBlkError, .opts = opts_domblkerror, - .info = info_domblkerror, + .info = &info_domblkerror, .flags = 0 }, {.name = "domblkinfo", .handler = cmdDomblkinfo, .opts = opts_domblkinfo, - .info = info_domblkinfo, + .info = &info_domblkinfo, .flags = 0 }, {.name = "domblklist", .handler = cmdDomblklist, .opts = opts_domblklist, - .info = info_domblklist, + .info = &info_domblklist, .flags = 0 }, {.name = "domblkstat", .handler = cmdDomblkstat, .opts = opts_domblkstat, - .info = info_domblkstat, + .info = &info_domblkstat, .flags = 0 }, {.name = "domcontrol", .handler = cmdDomControl, .opts = opts_domcontrol, - .info = info_domcontrol, + .info = &info_domcontrol, .flags = 0 }, {.name = "domif-getlink", .handler = cmdDomIfGetLink, .opts = opts_domif_getlink, - .info = info_domif_getlink, + .info = &info_domif_getlink, .flags = 0 }, {.name = "domifaddr", .handler = cmdDomIfAddr, .opts = opts_domifaddr, - .info = info_domifaddr, + .info = &info_domifaddr, .flags = 0 }, {.name = "domiflist", .handler = cmdDomiflist, .opts = opts_domiflist, - .info = info_domiflist, + .info = &info_domiflist, .flags = 0 }, {.name = "domifstat", .handler = cmdDomIfstat, .opts = opts_domifstat, - .info = info_domifstat, + .info = &info_domifstat, .flags = 0 }, {.name = "dominfo", .handler = cmdDominfo, .opts = opts_dominfo, - .info = info_dominfo, + .info = &info_dominfo, .flags = 0 }, {.name = "dommemstat", .handler = cmdDomMemStat, .opts = opts_dommemstat, - .info = info_dommemstat, + .info = &info_dommemstat, .flags = 0 }, {.name = "domstate", .handler = cmdDomstate, .opts = opts_domstate, - .info = info_domstate, + .info = &info_domstate, .flags = 0 }, {.name = "domstats", .handler = cmdDomstats, .opts = opts_domstats, - .info = info_domstats, + .info = &info_domstats, .flags = 0 }, {.name = "domtime", .handler = cmdDomTime, .opts = opts_domtime, - .info = info_domtime, + .info = &info_domtime, .flags = 0 }, {.name = "list", .handler = cmdList, .opts = opts_list, - .info = info_list, + .info = &info_list, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e2764efc4a..6768a1f24e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -341,14 +341,9 @@ virshNodeGetCPUCount(virConnectPtr conn) /* * "attach-device" command */ -static const vshCmdInfo info_attach_device[] = { - {.name = "help", - .data = N_("attach device from an XML file") - }, - {.name = "desc", - .data = N_("Attach device from an XML <file>.") - }, - {.name = NULL} +static const vshCmdInfo info_attach_device = { + .help = N_("attach device from an XML file"), + .desc = N_("Attach device from an XML <file>."), }; static const vshCmdOptDef opts_attach_device[] = { @@ -416,14 +411,9 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) /* * "attach-disk" command */ -static const vshCmdInfo info_attach_disk[] = { - {.name = "help", - .data = N_("attach disk device") - }, - {.name = "desc", - .data = N_("Attach new disk device.") - }, - {.name = NULL} +static const vshCmdInfo info_attach_disk = { + .help = N_("attach disk device"), + .desc = N_("Attach new disk device."), }; static const vshCmdOptDef opts_attach_disk[] = { @@ -813,14 +803,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) /* * "attach-interface" command */ -static const vshCmdInfo info_attach_interface[] = { - {.name = "help", - .data = N_("attach network interface") - }, - {.name = "desc", - .data = N_("Attach new network interface.") - }, - {.name = NULL} +static const vshCmdInfo info_attach_interface = { + .help = N_("attach network interface"), + .desc = N_("Attach new network interface."), }; static const vshCmdOptDef opts_attach_interface[] = { @@ -1149,14 +1134,9 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) /* * "autostart" command */ -static const vshCmdInfo info_autostart[] = { - {.name = "help", - .data = N_("autostart a domain") - }, - {.name = "desc", - .data = N_("Configure a domain to be automatically started at boot.") - }, - {.name = NULL} +static const vshCmdInfo info_autostart = { + .help = N_("autostart a domain"), + .desc = N_("Configure a domain to be automatically started at boot."), }; static const vshCmdOptDef opts_autostart[] = { @@ -1199,14 +1179,9 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd) /* * "blkdeviotune" command */ -static const vshCmdInfo info_blkdeviotune[] = { - {.name = "help", - .data = N_("Set or query a block device I/O tuning parameters.") - }, - {.name = "desc", - .data = N_("Set or query disk I/O parameters such as block throttling.") - }, - {.name = NULL} +static const vshCmdInfo info_blkdeviotune = { + .help = N_("Set or query a block device I/O tuning parameters."), + .desc = N_("Set or query disk I/O parameters such as block throttling."), }; static const vshCmdOptDef opts_blkdeviotune[] = { @@ -1523,14 +1498,9 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) /* * "blkiotune" command */ -static const vshCmdInfo info_blkiotune[] = { - {.name = "help", - .data = N_("Get or set blkio parameters") - }, - {.name = "desc", - .data = N_("Get or set the current blkio parameters for a guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_blkiotune = { + .help = N_("Get or set blkio parameters"), + .desc = N_("Get or set the current blkio parameters for a guest domain."), }; static const vshCmdOptDef opts_blkiotune[] = { @@ -2002,14 +1972,9 @@ virshBlockJobWait(virshBlockJobWaitData *data) /* * "blockcommit" command */ -static const vshCmdInfo info_blockcommit[] = { - {.name = "help", - .data = N_("Start a block commit operation.") - }, - {.name = "desc", - .data = N_("Commit changes from a snapshot down to its backing image.") - }, - {.name = NULL} +static const vshCmdInfo info_blockcommit = { + .help = N_("Start a block commit operation."), + .desc = N_("Commit changes from a snapshot down to its backing image."), }; static const vshCmdOptDef opts_blockcommit[] = { @@ -2226,14 +2191,9 @@ cmdBlockcommit(vshControl *ctl, const vshCmd *cmd) /* * "blockcopy" command */ -static const vshCmdInfo info_blockcopy[] = { - {.name = "help", - .data = N_("Start a block copy operation.") - }, - {.name = "desc", - .data = N_("Copy a disk backing image chain to dest.") - }, - {.name = NULL} +static const vshCmdInfo info_blockcopy = { + .help = N_("Start a block copy operation."), + .desc = N_("Copy a disk backing image chain to dest."), }; static const vshCmdOptDef opts_blockcopy[] = { @@ -2563,14 +2523,9 @@ cmdBlockcopy(vshControl *ctl, const vshCmd *cmd) /* * "blockjob" command */ -static const vshCmdInfo info_blockjob[] = { - {.name = "help", - .data = N_("Manage active block operations") - }, - {.name = "desc", - .data = N_("Query, adjust speed, or cancel active block operations.") - }, - {.name = NULL} +static const vshCmdInfo info_blockjob = { + .help = N_("Manage active block operations"), + .desc = N_("Query, adjust speed, or cancel active block operations."), }; static const vshCmdOptDef opts_blockjob[] = { @@ -2779,14 +2734,9 @@ cmdBlockjob(vshControl *ctl, const vshCmd *cmd) /* * "blockpull" command */ -static const vshCmdInfo info_blockpull[] = { - {.name = "help", - .data = N_("Populate a disk from its backing image.") - }, - {.name = "desc", - .data = N_("Populate a disk from its backing image.") - }, - {.name = NULL} +static const vshCmdInfo info_blockpull = { + .help = N_("Populate a disk from its backing image."), + .desc = N_("Populate a disk from its backing image."), }; static const vshCmdOptDef opts_blockpull[] = { @@ -2926,14 +2876,9 @@ cmdBlockpull(vshControl *ctl, const vshCmd *cmd) /* * "blockresize" command */ -static const vshCmdInfo info_blockresize[] = { - {.name = "help", - .data = N_("Resize block device of domain.") - }, - {.name = "desc", - .data = N_("Resize block device of domain.") - }, - {.name = NULL} +static const vshCmdInfo info_blockresize = { + .help = N_("Resize block device of domain."), + .desc = N_("Resize block device of domain."), }; static const vshCmdOptDef opts_blockresize[] = { @@ -2997,14 +2942,9 @@ cmdBlockresize(vshControl *ctl, const vshCmd *cmd) /* * "console" command */ -static const vshCmdInfo info_console[] = { - {.name = "help", - .data = N_("connect to the guest console") - }, - {.name = "desc", - .data = N_("Connect the virtual serial console for the guest") - }, - {.name = NULL} +static const vshCmdInfo info_console = { + .help = N_("connect to the guest console"), + .desc = N_("Connect the virtual serial console for the guest"), }; static const vshCmdOptDef opts_console[] = { @@ -3092,15 +3032,10 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) /* "domif-setlink" command */ -static const vshCmdInfo info_domif_setlink[] = { - {.name = "help", - .data = N_("set link state of a virtual interface") - }, - {.name = "desc", - .data = N_("Set link state of a domain's virtual interface. This command " - "wraps usage of update-device command.") - }, - {.name = NULL} +static const vshCmdInfo info_domif_setlink = { + .help = N_("set link state of a virtual interface"), + .desc = N_("Set link state of a domain's virtual interface. This command " + "wraps usage of update-device command."), }; static const vshCmdOptDef opts_domif_setlink[] = { @@ -3244,14 +3179,9 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) /* "domiftune" command */ -static const vshCmdInfo info_domiftune[] = { - {.name = "help", - .data = N_("get/set parameters of a virtual interface") - }, - {.name = "desc", - .data = N_("Get/set parameters of a domain's virtual interface.") - }, - {.name = NULL} +static const vshCmdInfo info_domiftune = { + .help = N_("get/set parameters of a virtual interface"), + .desc = N_("Get/set parameters of a domain's virtual interface."), }; static const vshCmdOptDef opts_domiftune[] = { @@ -3440,14 +3370,9 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) /* * "suspend" command */ -static const vshCmdInfo info_suspend[] = { - {.name = "help", - .data = N_("suspend a domain") - }, - {.name = "desc", - .data = N_("Suspend a running domain.") - }, - {.name = NULL} +static const vshCmdInfo info_suspend = { + .help = N_("suspend a domain"), + .desc = N_("Suspend a running domain."), }; static const vshCmdOptDef opts_suspend[] = { @@ -3476,17 +3401,12 @@ cmdSuspend(vshControl *ctl, const vshCmd *cmd) /* * "dompmsuspend" command */ -static const vshCmdInfo info_dom_pm_suspend[] = { - {.name = "help", - .data = N_("suspend a domain gracefully using power management " - "functions") - }, - {.name = "desc", - .data = N_("Suspends a running domain using guest OS's power management. " +static const vshCmdInfo info_dom_pm_suspend = { + .help = N_("suspend a domain gracefully using power management " + "functions"), + .desc = N_("Suspends a running domain using guest OS's power management. " "(Note: This requires a guest agent configured and running in " - "the guest OS).") - }, - {.name = NULL} + "the guest OS)."), }; static const vshCmdOptDef opts_dom_pm_suspend[] = { @@ -3546,15 +3466,10 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) * "dompmwakeup" command */ -static const vshCmdInfo info_dom_pm_wakeup[] = { - {.name = "help", - .data = N_("wakeup a domain from pmsuspended state") - }, - {.name = "desc", - .data = N_("Wakeup a domain that was previously suspended " - "by power management.") - }, - {.name = NULL} +static const vshCmdInfo info_dom_pm_wakeup = { + .help = N_("wakeup a domain from pmsuspended state"), + .desc = N_("Wakeup a domain that was previously suspended " + "by power management."), }; static const vshCmdOptDef opts_dom_pm_wakeup[] = { @@ -3587,14 +3502,9 @@ cmdDomPMWakeup(vshControl *ctl, const vshCmd *cmd) /* * "undefine" command */ -static const vshCmdInfo info_undefine[] = { - {.name = "help", - .data = N_("undefine a domain") - }, - {.name = "desc", - .data = N_("Undefine an inactive domain, or convert persistent to transient.") - }, - {.name = NULL} +static const vshCmdInfo info_undefine = { + .help = N_("undefine a domain"), + .desc = N_("Undefine an inactive domain, or convert persistent to transient."), }; static const vshCmdOptDef opts_undefine[] = { @@ -4016,16 +3926,11 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) /* * "start" command */ -static const vshCmdInfo info_start[] = { - {.name = "help", - .data = N_("start a (previously defined) inactive domain") - }, - {.name = "desc", - .data = N_("Start a domain, either from the last managedsave\n" +static const vshCmdInfo info_start = { + .help = N_("start a (previously defined) inactive domain"), + .desc = N_("Start a domain, either from the last managedsave\n" " state, or via a fresh boot if no managedsave state\n" - " is present.") - }, - {.name = NULL} + " is present."), }; static const vshCmdOptDef opts_start[] = { @@ -4182,14 +4087,9 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) /* * "save" command */ -static const vshCmdInfo info_save[] = { - {.name = "help", - .data = N_("save a domain state to a file") - }, - {.name = "desc", - .data = N_("Save the RAM state of a running domain.") - }, - {.name = NULL} +static const vshCmdInfo info_save = { + .help = N_("save a domain state to a file"), + .desc = N_("Save the RAM state of a running domain."), }; static const vshCmdOptDef opts_save[] = { @@ -4537,14 +4437,9 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) /* * "save-image-dumpxml" command */ -static const vshCmdInfo info_save_image_dumpxml[] = { - {.name = "help", - .data = N_("saved state domain information in XML") - }, - {.name = "desc", - .data = N_("Dump XML of domain information for a saved state file to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_save_image_dumpxml = { + .help = N_("saved state domain information in XML"), + .desc = N_("Dump XML of domain information for a saved state file to stdout."), }; static const vshCmdOptDef opts_save_image_dumpxml[] = { @@ -4599,14 +4494,9 @@ cmdSaveImageDumpxml(vshControl *ctl, const vshCmd *cmd) /* * "save-image-define" command */ -static const vshCmdInfo info_save_image_define[] = { - {.name = "help", - .data = N_("redefine the XML for a domain's saved state file") - }, - {.name = "desc", - .data = N_("Replace the domain XML associated with a saved state file") - }, - {.name = NULL} +static const vshCmdInfo info_save_image_define = { + .help = N_("redefine the XML for a domain's saved state file"), + .desc = N_("Replace the domain XML associated with a saved state file"), }; static const vshCmdOptDef opts_save_image_define[] = { @@ -4667,14 +4557,9 @@ cmdSaveImageDefine(vshControl *ctl, const vshCmd *cmd) /* * "save-image-edit" command */ -static const vshCmdInfo info_save_image_edit[] = { - {.name = "help", - .data = N_("edit XML for a domain's saved state file") - }, - {.name = "desc", - .data = N_("Edit the domain XML associated with a saved state file") - }, - {.name = NULL} +static const vshCmdInfo info_save_image_edit = { + .help = N_("edit XML for a domain's saved state file"), + .desc = N_("Edit the domain XML associated with a saved state file"), }; static const vshCmdOptDef opts_save_image_edit[] = { @@ -4740,17 +4625,12 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd) /* * "managedsave" command */ -static const vshCmdInfo info_managedsave[] = { - {.name = "help", - .data = N_("managed save of a domain state") - }, - {.name = "desc", - .data = N_("Save and destroy a running domain, so it can be restarted from\n" +static const vshCmdInfo info_managedsave = { + .help = N_("managed save of a domain state"), + .desc = N_("Save and destroy a running domain, so it can be restarted from\n" " the same state at a later time. When the virsh 'start'\n" " command is next run for the domain, it will automatically\n" - " be started from this saved state.") - }, - {.name = NULL} + " be started from this saved state."), }; static const vshCmdOptDef opts_managedsave[] = { @@ -4858,14 +4738,9 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) /* * "managedsave-remove" command */ -static const vshCmdInfo info_managedsaveremove[] = { - {.name = "help", - .data = N_("Remove managed save of a domain") - }, - {.name = "desc", - .data = N_("Remove an existing managed save state file from a domain") - }, - {.name = NULL} +static const vshCmdInfo info_managedsaveremove = { + .help = N_("Remove managed save of a domain"), + .desc = N_("Remove an existing managed save state file from a domain"), }; static const vshCmdOptDef opts_managedsaveremove[] = { @@ -4909,14 +4784,9 @@ cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) /* * "managedsave-edit" command */ -static const vshCmdInfo info_managed_save_edit[] = { - {.name = "help", - .data = N_("edit XML for a domain's managed save state file") - }, - {.name = "desc", - .data = N_("Edit the domain XML associated with the managed save state file") - }, - {.name = NULL} +static const vshCmdInfo info_managed_save_edit = { + .help = N_("edit XML for a domain's managed save state file"), + .desc = N_("Edit the domain XML associated with the managed save state file"), }; static const vshCmdOptDef opts_managed_save_edit[] = { @@ -4974,14 +4844,9 @@ cmdManagedSaveEdit(vshControl *ctl, const vshCmd *cmd) /* * "managedsave-dumpxml" command */ -static const vshCmdInfo info_managed_save_dumpxml[] = { - {.name = "help", - .data = N_("Domain information of managed save state file in XML") - }, - {.name = "desc", - .data = N_("Dump XML of domain information for a managed save state file to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_managed_save_dumpxml = { + .help = N_("Domain information of managed save state file in XML"), + .desc = N_("Dump XML of domain information for a managed save state file to stdout."), }; static const vshCmdOptDef opts_managed_save_dumpxml[] = { @@ -5030,14 +4895,9 @@ cmdManagedSaveDumpxml(vshControl *ctl, const vshCmd *cmd) /* * "managedsave-define" command */ -static const vshCmdInfo info_managed_save_define[] = { - {.name = "help", - .data = N_("redefine the XML for a domain's managed save state file") - }, - {.name = "desc", - .data = N_("Replace the domain XML associated with a managed save state file") - }, - {.name = NULL} +static const vshCmdInfo info_managed_save_define = { + .help = N_("redefine the XML for a domain's managed save state file"), + .desc = N_("Replace the domain XML associated with a managed save state file"), }; static const vshCmdOptDef opts_managed_save_define[] = { @@ -5097,14 +4957,9 @@ cmdManagedSaveDefine(vshControl *ctl, const vshCmd *cmd) /* * "schedinfo" command */ -static const vshCmdInfo info_schedinfo[] = { - {.name = "help", - .data = N_("show/set scheduler parameters") - }, - {.name = "desc", - .data = N_("Show/Set scheduler parameters.") - }, - {.name = NULL} +static const vshCmdInfo info_schedinfo = { + .help = N_("show/set scheduler parameters"), + .desc = N_("Show/Set scheduler parameters."), }; static const vshCmdOptDef opts_schedinfo[] = { @@ -5317,14 +5172,9 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) /* * "restore" command */ -static const vshCmdInfo info_restore[] = { - {.name = "help", - .data = N_("restore a domain from a saved state in a file") - }, - {.name = "desc", - .data = N_("Restore a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_restore = { + .help = N_("restore a domain from a saved state in a file"), + .desc = N_("Restore a domain."), }; static const vshCmdOptDef opts_restore[] = { @@ -5404,14 +5254,9 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) /* * "dump" command */ -static const vshCmdInfo info_dump[] = { - {.name = "help", - .data = N_("dump the core of a domain to a file for analysis") - }, - {.name = "desc", - .data = N_("Core dump a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_dump = { + .help = N_("dump the core of a domain to a file for analysis"), + .desc = N_("Core dump a domain."), }; static const vshCmdOptDef opts_dump[] = { @@ -5578,15 +5423,10 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) return true; } -static const vshCmdInfo info_screenshot[] = { - {.name = "help", - .data = N_("take a screenshot of a current domain console and store it " - "into a file") - }, - {.name = "desc", - .data = N_("screenshot of a current domain console") - }, - {.name = NULL} +static const vshCmdInfo info_screenshot = { + .help = N_("take a screenshot of a current domain console and store it " + "into a file"), + .desc = N_("screenshot of a current domain console"), }; static const vshCmdOptDef opts_screenshot[] = { @@ -5713,14 +5553,9 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) /* * "set-lifecycle-action" command */ -static const vshCmdInfo info_setLifecycleAction[] = { - {.name = "help", - .data = N_("change lifecycle actions") - }, - {.name = "desc", - .data = N_("Change lifecycle actions for the guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_setLifecycleAction = { + .help = N_("change lifecycle actions"), + .desc = N_("Change lifecycle actions for the guest domain."), }; static const vshCmdOptDef opts_setLifecycleAction[] = { @@ -5810,14 +5645,9 @@ cmdSetLifecycleAction(vshControl *ctl, const vshCmd *cmd) /* * "set-user-password" command */ -static const vshCmdInfo info_set_user_password[] = { - {.name = "help", - .data = N_("set the user password inside the domain") - }, - {.name = "desc", - .data = N_("changes the password of the specified user inside the domain") - }, - {.name = NULL} +static const vshCmdInfo info_set_user_password = { + .help = N_("set the user password inside the domain"), + .desc = N_("changes the password of the specified user inside the domain"), }; static const vshCmdOptDef opts_set_user_password[] = { @@ -5870,14 +5700,9 @@ cmdSetUserPassword(vshControl *ctl, const vshCmd *cmd) /* * "resume" command */ -static const vshCmdInfo info_resume[] = { - {.name = "help", - .data = N_("resume a domain") - }, - {.name = "desc", - .data = N_("Resume a previously suspended domain.") - }, - {.name = NULL} +static const vshCmdInfo info_resume = { + .help = N_("resume a domain"), + .desc = N_("Resume a previously suspended domain."), }; static const vshCmdOptDef opts_resume[] = { @@ -5906,14 +5731,9 @@ cmdResume(vshControl *ctl, const vshCmd *cmd) /* * "shutdown" command */ -static const vshCmdInfo info_shutdown[] = { - {.name = "help", - .data = N_("gracefully shutdown a domain") - }, - {.name = "desc", - .data = N_("Run shutdown in the target domain.") - }, - {.name = NULL} +static const vshCmdInfo info_shutdown = { + .help = N_("gracefully shutdown a domain"), + .desc = N_("Run shutdown in the target domain."), }; static const vshCmdOptDef opts_shutdown[] = { @@ -5986,14 +5806,9 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) /* * "reboot" command */ -static const vshCmdInfo info_reboot[] = { - {.name = "help", - .data = N_("reboot a domain") - }, - {.name = "desc", - .data = N_("Run a reboot command in the target domain.") - }, - {.name = NULL} +static const vshCmdInfo info_reboot = { + .help = N_("reboot a domain"), + .desc = N_("Run a reboot command in the target domain."), }; static const vshCmdOptDef opts_reboot[] = { @@ -6060,14 +5875,9 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) /* * "reset" command */ -static const vshCmdInfo info_reset[] = { - {.name = "help", - .data = N_("reset a domain") - }, - {.name = "desc", - .data = N_("Reset the target domain as if by power button") - }, - {.name = NULL} +static const vshCmdInfo info_reset = { + .help = N_("reset a domain"), + .desc = N_("Reset the target domain as if by power button"), }; static const vshCmdOptDef opts_reset[] = { @@ -6096,14 +5906,9 @@ cmdReset(vshControl *ctl, const vshCmd *cmd) /* * "domjobinfo" command */ -static const vshCmdInfo info_domjobinfo[] = { - {.name = "help", - .data = N_("domain job information") - }, - {.name = "desc", - .data = N_("Returns information about jobs running on a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_domjobinfo = { + .help = N_("domain job information"), + .desc = N_("Returns information about jobs running on a domain."), }; static const vshCmdOptDef opts_domjobinfo[] = { @@ -6516,14 +6321,9 @@ cmdDomjobinfo(vshControl *ctl, const vshCmd *cmd) /* * "domjobabort" command */ -static const vshCmdInfo info_domjobabort[] = { - {.name = "help", - .data = N_("abort active domain job") - }, - {.name = "desc", - .data = N_("Aborts the currently running domain job") - }, - {.name = NULL} +static const vshCmdInfo info_domjobabort = { + .help = N_("abort active domain job"), + .desc = N_("Aborts the currently running domain job"), }; static const vshCmdOptDef opts_domjobabort[] = { @@ -6562,14 +6362,9 @@ cmdDomjobabort(vshControl *ctl, const vshCmd *cmd) /* * "vcpucount" command */ -static const vshCmdInfo info_vcpucount[] = { - {.name = "help", - .data = N_("domain vcpu counts") - }, - {.name = "desc", - .data = N_("Returns the number of virtual CPUs used by the domain.") - }, - {.name = NULL} +static const vshCmdInfo info_vcpucount = { + .help = N_("domain vcpu counts"), + .desc = N_("Returns the number of virtual CPUs used by the domain."), }; static const vshCmdOptDef opts_vcpucount[] = { @@ -6747,14 +6542,9 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd) /* * "vcpuinfo" command */ -static const vshCmdInfo info_vcpuinfo[] = { - {.name = "help", - .data = N_("detailed domain vcpu information") - }, - {.name = "desc", - .data = N_("Returns basic information about the domain virtual CPUs.") - }, - {.name = NULL} +static const vshCmdInfo info_vcpuinfo = { + .help = N_("detailed domain vcpu information"), + .desc = N_("Returns basic information about the domain virtual CPUs."), }; static const vshCmdOptDef opts_vcpuinfo[] = { @@ -6967,14 +6757,9 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) /* * "vcpupin" command */ -static const vshCmdInfo info_vcpupin[] = { - {.name = "help", - .data = N_("control or query domain vcpu affinity") - }, - {.name = "desc", - .data = N_("Pin domain VCPUs to host physical CPUs.") - }, - {.name = NULL} +static const vshCmdInfo info_vcpupin = { + .help = N_("control or query domain vcpu affinity"), + .desc = N_("Pin domain VCPUs to host physical CPUs."), }; static const vshCmdOptDef opts_vcpupin[] = { @@ -7185,14 +6970,9 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) /* * "emulatorpin" command */ -static const vshCmdInfo info_emulatorpin[] = { - {.name = "help", - .data = N_("control or query domain emulator affinity") - }, - {.name = "desc", - .data = N_("Pin domain emulator threads to host physical CPUs.") - }, - {.name = NULL} +static const vshCmdInfo info_emulatorpin = { + .help = N_("control or query domain emulator affinity"), + .desc = N_("Pin domain emulator threads to host physical CPUs."), }; static const vshCmdOptDef opts_emulatorpin[] = { @@ -7285,14 +7065,9 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) /* * "setvcpus" command */ -static const vshCmdInfo info_setvcpus[] = { - {.name = "help", - .data = N_("change number of virtual CPUs") - }, - {.name = "desc", - .data = N_("Change the number of virtual CPUs in the guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_setvcpus = { + .help = N_("change number of virtual CPUs"), + .desc = N_("Change the number of virtual CPUs in the guest domain."), }; static const vshCmdOptDef opts_setvcpus[] = { @@ -7377,15 +7152,10 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) /* * "guestvcpus" command */ -static const vshCmdInfo info_guestvcpus[] = { - {.name = "help", - .data = N_("query or modify state of vcpu in the guest (via agent)") - }, - {.name = "desc", - .data = N_("Use the guest agent to query or set cpu state from guest's " - "point of view") - }, - {.name = NULL} +static const vshCmdInfo info_guestvcpus = { + .help = N_("query or modify state of vcpu in the guest (via agent)"), + .desc = N_("Use the guest agent to query or set cpu state from guest's " + "point of view"), }; static const vshCmdOptDef opts_guestvcpus[] = { @@ -7461,14 +7231,9 @@ cmdGuestvcpus(vshControl *ctl, const vshCmd *cmd) /* * "setvcpu" command */ -static const vshCmdInfo info_setvcpu[] = { - {.name = "help", - .data = N_("attach/detach vcpu or groups of threads") - }, - {.name = "desc", - .data = N_("Add or remove vcpus") - }, - {.name = NULL} +static const vshCmdInfo info_setvcpu = { + .help = N_("attach/detach vcpu or groups of threads"), + .desc = N_("Add or remove vcpus"), }; static const vshCmdOptDef opts_setvcpu[] = { @@ -7539,15 +7304,10 @@ cmdSetvcpu(vshControl *ctl, const vshCmd *cmd) /* * "domblkthreshold" command */ -static const vshCmdInfo info_domblkthreshold[] = { - {.name = "help", - .data = N_("set the threshold for block-threshold event for a given block " - "device or it's backing chain element") - }, - {.name = "desc", - .data = N_("set threshold for block-threshold event for a block device") - }, - {.name = NULL} +static const vshCmdInfo info_domblkthreshold = { + .help = N_("set the threshold for block-threshold event for a given block " + "device or it's backing chain element"), + .desc = N_("set threshold for block-threshold event for a block device"), }; static const vshCmdOptDef opts_domblkthreshold[] = { @@ -7593,14 +7353,9 @@ cmdDomblkthreshold(vshControl *ctl, const vshCmd *cmd) /* * "iothreadinfo" command */ -static const vshCmdInfo info_iothreadinfo[] = { - {.name = "help", - .data = N_("view domain IOThreads") - }, - {.name = "desc", - .data = N_("Returns basic information about the domain IOThreads.") - }, - {.name = NULL} +static const vshCmdInfo info_iothreadinfo = { + .help = N_("view domain IOThreads"), + .desc = N_("Returns basic information about the domain IOThreads."), }; static const vshCmdOptDef opts_iothreadinfo[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), @@ -7678,14 +7433,9 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd) /* * "iothreadpin" command */ -static const vshCmdInfo info_iothreadpin[] = { - {.name = "help", - .data = N_("control domain IOThread affinity") - }, - {.name = "desc", - .data = N_("Pin domain IOThreads to host physical CPUs.") - }, - {.name = NULL} +static const vshCmdInfo info_iothreadpin = { + .help = N_("control domain IOThread affinity"), + .desc = N_("Pin domain IOThreads to host physical CPUs."), }; static const vshCmdOptDef opts_iothreadpin[] = { @@ -7756,14 +7506,9 @@ cmdIOThreadPin(vshControl *ctl, const vshCmd *cmd) /* * "iothreadadd" command */ -static const vshCmdInfo info_iothreadadd[] = { - {.name = "help", - .data = N_("add an IOThread to the guest domain") - }, - {.name = "desc", - .data = N_("Add an IOThread to the guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_iothreadadd = { + .help = N_("add an IOThread to the guest domain"), + .desc = N_("Add an IOThread to the guest domain."), }; static const vshCmdOptDef opts_iothreadadd[] = { @@ -7817,14 +7562,9 @@ cmdIOThreadAdd(vshControl *ctl, const vshCmd *cmd) /* * "iothreadset" command */ -static const vshCmdInfo info_iothreadset[] = { - {.name = "help", - .data = N_("modifies an existing IOThread of the guest domain") - }, - {.name = "desc", - .data = N_("Modifies an existing IOThread of the guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_iothreadset = { + .help = N_("modifies an existing IOThread of the guest domain"), + .desc = N_("Modifies an existing IOThread of the guest domain."), }; static const vshCmdOptDef opts_iothreadset[] = { @@ -7938,14 +7678,9 @@ cmdIOThreadSet(vshControl *ctl, const vshCmd *cmd) /* * "iothreaddel" command */ -static const vshCmdInfo info_iothreaddel[] = { - {.name = "help", - .data = N_("delete an IOThread from the guest domain") - }, - {.name = "desc", - .data = N_("Delete an IOThread from the guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_iothreaddel = { + .help = N_("delete an IOThread from the guest domain"), + .desc = N_("Delete an IOThread from the guest domain."), }; static const vshCmdOptDef opts_iothreaddel[] = { @@ -7999,14 +7734,9 @@ cmdIOThreadDel(vshControl *ctl, const vshCmd *cmd) /* * "cpu-stats" command */ -static const vshCmdInfo info_cpu_stats[] = { - {.name = "help", - .data = N_("show domain cpu statistics") - }, - {.name = "desc", - .data = N_("Display per-CPU and total statistics about the domain's CPUs") - }, - {.name = NULL} +static const vshCmdInfo info_cpu_stats = { + .help = N_("show domain cpu statistics"), + .desc = N_("Display per-CPU and total statistics about the domain's CPUs"), }; static const vshCmdOptDef opts_cpu_stats[] = { @@ -8180,14 +7910,9 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) /* * "create" command */ -static const vshCmdInfo info_create[] = { - {.name = "help", - .data = N_("create a domain from an XML file") - }, - {.name = "desc", - .data = N_("Create a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_create = { + .help = N_("create a domain from an XML file"), + .desc = N_("Create a domain."), }; static const vshCmdOptDef opts_create[] = { @@ -8305,14 +8030,9 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) /* * "define" command */ -static const vshCmdInfo info_define[] = { - {.name = "help", - .data = N_("define (but don't start) a domain from an XML file") - }, - {.name = "desc", - .data = N_("Define a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_define = { + .help = N_("define (but don't start) a domain from an XML file"), + .desc = N_("Define a domain."), }; static const vshCmdOptDef opts_define[] = { @@ -8360,14 +8080,9 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) /* * "destroy" command */ -static const vshCmdInfo info_destroy[] = { - {.name = "help", - .data = N_("destroy (stop) a domain") - }, - {.name = "desc", - .data = N_("Forcefully stop a given domain, but leave its resources intact.") - }, - {.name = NULL} +static const vshCmdInfo info_destroy = { + .help = N_("destroy (stop) a domain"), + .desc = N_("Forcefully stop a given domain, but leave its resources intact."), }; static const vshCmdOptDef opts_destroy[] = { @@ -8416,15 +8131,10 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) /* * "desc" command for managing domain description and title */ -static const vshCmdInfo info_desc[] = { - {.name = "help", - .data = N_("show or set domain's description or title") - }, - {.name = "desc", - .data = N_("Allows setting or modifying the description or title of " - "a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_desc = { + .help = N_("show or set domain's description or title"), + .desc = N_("Allows setting or modifying the description or title of " + "a domain."), }; static const vshCmdOptDef opts_desc[] = { @@ -8577,14 +8287,9 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) } -static const vshCmdInfo info_metadata[] = { - {.name = "help", - .data = N_("show or set domain's custom XML metadata") - }, - {.name = "desc", - .data = N_("Shows or modifies the XML metadata of a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_metadata = { + .help = N_("show or set domain's custom XML metadata"), + .desc = N_("Shows or modifies the XML metadata of a domain."), }; static const vshCmdOptDef opts_metadata[] = { @@ -8722,14 +8427,9 @@ cmdMetadata(vshControl *ctl, const vshCmd *cmd) /* * "inject-nmi" command */ -static const vshCmdInfo info_inject_nmi[] = { - {.name = "help", - .data = N_("Inject NMI to the guest") - }, - {.name = "desc", - .data = N_("Inject NMI to the guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_inject_nmi = { + .help = N_("Inject NMI to the guest"), + .desc = N_("Inject NMI to the guest domain."), }; static const vshCmdOptDef opts_inject_nmi[] = { @@ -8754,14 +8454,9 @@ cmdInjectNMI(vshControl *ctl, const vshCmd *cmd) /* * "send-key" command */ -static const vshCmdInfo info_send_key[] = { - {.name = "help", - .data = N_("Send keycodes to the guest") - }, - {.name = "desc", - .data = N_("Send keycodes (integers or symbolic names) to the guest") - }, - {.name = NULL} +static const vshCmdInfo info_send_key = { + .help = N_("Send keycodes to the guest"), + .desc = N_("Send keycodes (integers or symbolic names) to the guest"), }; static const vshCmdOptDef opts_send_key[] = { @@ -8854,14 +8549,9 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd) /* * "send-process-signal" command */ -static const vshCmdInfo info_send_process_signal[] = { - {.name = "help", - .data = N_("Send signals to processes") - }, - {.name = "desc", - .data = N_("Send signals to processes in the guest") - }, - {.name = NULL} +static const vshCmdInfo info_send_process_signal = { + .help = N_("Send signals to processes"), + .desc = N_("Send signals to processes in the guest"), }; static const vshCmdOptDef opts_send_process_signal[] = { @@ -8949,14 +8639,9 @@ cmdSendProcessSignal(vshControl *ctl, const vshCmd *cmd) /* * "setmem" command */ -static const vshCmdInfo info_setmem[] = { - {.name = "help", - .data = N_("change memory allocation") - }, - {.name = "desc", - .data = N_("Change the current memory allocation in the guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_setmem = { + .help = N_("change memory allocation"), + .desc = N_("Change the current memory allocation in the guest domain."), }; static const vshCmdOptDef opts_setmem[] = { @@ -9023,14 +8708,9 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) /* * "setmaxmem" command */ -static const vshCmdInfo info_setmaxmem[] = { - {.name = "help", - .data = N_("change maximum memory limit") - }, - {.name = "desc", - .data = N_("Change the maximum memory allocation limit in the guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_setmaxmem = { + .help = N_("change maximum memory limit"), + .desc = N_("Change the maximum memory allocation limit in the guest domain."), }; static const vshCmdOptDef opts_setmaxmem[] = { @@ -9095,14 +8775,9 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) /* * "update-memory-device" command */ -static const vshCmdInfo info_update_memory_device[] = { - {.name = "help", - .data = N_("update memory device of a domain") - }, - {.name = "desc", - .data = N_("Update values of a memory device of a domain") - }, - {.name = NULL} +static const vshCmdInfo info_update_memory_device = { + .help = N_("update memory device of a domain"), + .desc = N_("Update values of a memory device of a domain"), }; static const vshCmdOptDef opts_update_memory_device[] = { @@ -9249,14 +8924,9 @@ cmdUpdateMemoryDevice(vshControl *ctl, const vshCmd *cmd) /* * "memtune" command */ -static const vshCmdInfo info_memtune[] = { - {.name = "help", - .data = N_("Get or set memory parameters") - }, - {.name = "desc", - .data = N_("Get or set the current memory parameters for a guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_memtune = { + .help = N_("Get or set memory parameters"), + .desc = N_("Get or set the current memory parameters for a guest domain."), }; static const vshCmdOptDef opts_memtune[] = { @@ -9421,14 +9091,9 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) /* * "perf" command */ -static const vshCmdInfo info_perf[] = { - {.name = "help", - .data = N_("Get or set perf event") - }, - {.name = "desc", - .data = N_("Get or set the current perf events for a guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_perf = { + .help = N_("Get or set perf event"), + .desc = N_("Get or set the current perf events for a guest domain."), }; static const vshCmdOptDef opts_perf[] = { @@ -9550,14 +9215,9 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) /* * "numatune" command */ -static const vshCmdInfo info_numatune[] = { - {.name = "help", - .data = N_("Get or set numa parameters") - }, - {.name = "desc", - .data = N_("Get or set the current numa parameters for a guest domain.") - }, - {.name = NULL} +static const vshCmdInfo info_numatune = { + .help = N_("Get or set numa parameters"), + .desc = N_("Get or set the current numa parameters for a guest domain."), }; static const vshCmdOptDef opts_numatune[] = { @@ -9684,14 +9344,9 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) /* * "domlaunchsecinfo" command */ -static const vshCmdInfo info_domlaunchsecinfo[] = { - {.name = "help", - .data = N_("Get domain launch security info") - }, - {.name = "desc", - .data = N_("Get the launch security parameters for a guest domain") - }, - {.name = NULL} +static const vshCmdInfo info_domlaunchsecinfo = { + .help = N_("Get domain launch security info"), + .desc = N_("Get the launch security parameters for a guest domain"), }; static const vshCmdOptDef opts_domlaunchsecinfo[] = { @@ -9731,14 +9386,9 @@ cmdDomLaunchSecInfo(vshControl * ctl, const vshCmd * cmd) /* * "domsetlaunchsecstate" command */ -static const vshCmdInfo info_domsetlaunchsecstate[] = { - {.name = "help", - .data = N_("Set domain launch security state") - }, - {.name = "desc", - .data = N_("Set a secret in the guest domain's memory") - }, - {.name = NULL} +static const vshCmdInfo info_domsetlaunchsecstate = { + .help = N_("Set domain launch security state"), + .desc = N_("Set a secret in the guest domain's memory"), }; static const vshCmdOptDef opts_domsetlaunchsecstate[] = { @@ -9835,14 +9485,9 @@ cmdDomSetLaunchSecState(vshControl * ctl, const vshCmd * cmd) /* * "dom-fd-associate" command */ -static const vshCmdInfo info_dom_fd_associate[] = { - {.name = "help", - .data = N_("associate a FD with a domain") - }, - {.name = "desc", - .data = N_("associate a FD with a domain") - }, - {.name = NULL} +static const vshCmdInfo info_dom_fd_associate = { + .help = N_("associate a FD with a domain"), + .desc = N_("associate a FD with a domain"), }; static const vshCmdOptDef opts_dom_fd_associate[] = { @@ -9904,14 +9549,9 @@ cmdDomFdAssociate(vshControl *ctl, const vshCmd *cmd) /* * "qemu-monitor-command" command */ -static const vshCmdInfo info_qemu_monitor_command[] = { - {.name = "help", - .data = N_("QEMU Monitor Command") - }, - {.name = "desc", - .data = N_("QEMU Monitor Command") - }, - {.name = NULL} +static const vshCmdInfo info_qemu_monitor_command = { + .help = N_("QEMU Monitor Command"), + .desc = N_("QEMU Monitor Command"), }; static const vshCmdOptDef opts_qemu_monitor_command[] = { @@ -10156,14 +9796,9 @@ virshEventQemuPrint(virConnectPtr conn G_GNUC_UNUSED, vshEventDone(data->ctl); } -static const vshCmdInfo info_qemu_monitor_event[] = { - {.name = "help", - .data = N_("QEMU Monitor Events") - }, - {.name = "desc", - .data = N_("Listen for QEMU Monitor Events") - }, - {.name = NULL} +static const vshCmdInfo info_qemu_monitor_event = { + .help = N_("QEMU Monitor Events"), + .desc = N_("Listen for QEMU Monitor Events"), }; static const vshCmdOptDef opts_qemu_monitor_event[] = { @@ -10268,14 +9903,9 @@ cmdQemuMonitorEvent(vshControl *ctl, const vshCmd *cmd) /* * "qemu-attach" command */ -static const vshCmdInfo info_qemu_attach[] = { - {.name = "help", - .data = N_("QEMU Attach") - }, - {.name = "desc", - .data = N_("QEMU Attach") - }, - {.name = NULL} +static const vshCmdInfo info_qemu_attach = { + .help = N_("QEMU Attach"), + .desc = N_("QEMU Attach"), }; static const vshCmdOptDef opts_qemu_attach[] = { @@ -10312,14 +9942,9 @@ cmdQemuAttach(vshControl *ctl, const vshCmd *cmd) /* * "qemu-agent-command" command */ -static const vshCmdInfo info_qemu_agent_command[] = { - {.name = "help", - .data = N_("QEMU Guest Agent Command") - }, - {.name = "desc", - .data = N_("Run an arbitrary qemu guest agent command; use at your own risk") - }, - {.name = NULL} +static const vshCmdInfo info_qemu_agent_command = { + .help = N_("QEMU Guest Agent Command"), + .desc = N_("Run an arbitrary qemu guest agent command; use at your own risk"), }; static const vshCmdOptDef opts_qemu_agent_command[] = { @@ -10426,14 +10051,9 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) /* * "lxc-enter-namespace" namespace */ -static const vshCmdInfo info_lxc_enter_namespace[] = { - {.name = "help", - .data = N_("LXC Guest Enter Namespace") - }, - {.name = "desc", - .data = N_("Run an arbitrary command in a lxc guest namespace; use at your own risk") - }, - {.name = NULL} +static const vshCmdInfo info_lxc_enter_namespace = { + .help = N_("LXC Guest Enter Namespace"), + .desc = N_("Run an arbitrary command in a lxc guest namespace; use at your own risk"), }; static const vshCmdOptDef opts_lxc_enter_namespace[] = { @@ -10542,14 +10162,9 @@ cmdLxcEnterNamespace(vshControl *ctl, const vshCmd *cmd) /* * "dumpxml" command */ -static const vshCmdInfo info_dumpxml[] = { - {.name = "help", - .data = N_("domain information in XML") - }, - {.name = "desc", - .data = N_("Output the domain information as an XML dump to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_dumpxml = { + .help = N_("domain information in XML"), + .desc = N_("Output the domain information as an XML dump to stdout."), }; static const vshCmdOptDef opts_dumpxml[] = { @@ -10620,14 +10235,9 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) /* * "domxml-from-native" command */ -static const vshCmdInfo info_domxmlfromnative[] = { - {.name = "help", - .data = N_("Convert native config to domain XML") - }, - {.name = "desc", - .data = N_("Convert native guest configuration format to domain XML format.") - }, - {.name = NULL} +static const vshCmdInfo info_domxmlfromnative = { + .help = N_("Convert native config to domain XML"), + .desc = N_("Convert native guest configuration format to domain XML format."), }; static const vshCmdOptDef opts_domxmlfromnative[] = { @@ -10673,14 +10283,9 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) /* * "domxml-to-native" command */ -static const vshCmdInfo info_domxmltonative[] = { - {.name = "help", - .data = N_("Convert domain XML to native config") - }, - {.name = "desc", - .data = N_("Convert domain XML config to a native guest configuration format.") - }, - {.name = NULL} +static const vshCmdInfo info_domxmltonative = { + .help = N_("Convert domain XML to native config"), + .desc = N_("Convert domain XML config to a native guest configuration format."), }; static const vshCmdOptDef opts_domxmltonative[] = { @@ -10745,14 +10350,9 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) /* * "domname" command */ -static const vshCmdInfo info_domname[] = { - {.name = "help", - .data = N_("convert a domain id or UUID to domain name") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_domname = { + .help = N_("convert a domain id or UUID to domain name"), + .desc = "", }; static const vshCmdOptDef opts_domname[] = { @@ -10781,14 +10381,9 @@ cmdDomname(vshControl *ctl, const vshCmd *cmd) /* * "domrename" command */ -static const vshCmdInfo info_domrename[] = { - {.name = "help", - .data = N_("rename a domain") - }, - {.name = "desc", - .data = "Rename an inactive domain." - }, - {.name = NULL} +static const vshCmdInfo info_domrename = { + .help = N_("rename a domain"), + .desc = "Rename an inactive domain.", }; static const vshCmdOptDef opts_domrename[] = { @@ -10826,14 +10421,9 @@ cmdDomrename(vshControl *ctl, const vshCmd *cmd) /* * "domid" command */ -static const vshCmdInfo info_domid[] = { - {.name = "help", - .data = N_("convert a domain name or UUID to domain id") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_domid = { + .help = N_("convert a domain name or UUID to domain id"), + .desc = "", }; static const vshCmdOptDef opts_domid[] = { @@ -10863,14 +10453,9 @@ cmdDomid(vshControl *ctl, const vshCmd *cmd) /* * "domuuid" command */ -static const vshCmdInfo info_domuuid[] = { - {.name = "help", - .data = N_("convert a domain name or id to domain UUID") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_domuuid = { + .help = N_("convert a domain name or id to domain UUID"), + .desc = "", }; static const vshCmdOptDef opts_domuuid[] = { @@ -10899,14 +10484,9 @@ cmdDomuuid(vshControl *ctl, const vshCmd *cmd) /* * "migrate" command */ -static const vshCmdInfo info_migrate[] = { - {.name = "help", - .data = N_("migrate domain to another host") - }, - {.name = "desc", - .data = N_("Migrate domain to another host. Add --live for live migration.") - }, - {.name = NULL} +static const vshCmdInfo info_migrate = { + .help = N_("migrate domain to another host"), + .desc = N_("Migrate domain to another host. Add --live for live migration."), }; static const vshCmdOptDef opts_migrate[] = { @@ -11601,14 +11181,9 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) /* * "migrate-setmaxdowntime" command */ -static const vshCmdInfo info_migrate_setmaxdowntime[] = { - {.name = "help", - .data = N_("set maximum tolerable downtime") - }, - {.name = "desc", - .data = N_("Set maximum tolerable downtime of a domain which is being live-migrated to another host.") - }, - {.name = NULL} +static const vshCmdInfo info_migrate_setmaxdowntime = { + .help = N_("set maximum tolerable downtime"), + .desc = N_("Set maximum tolerable downtime of a domain which is being live-migrated to another host."), }; static const vshCmdOptDef opts_migrate_setmaxdowntime[] = { @@ -11645,14 +11220,9 @@ cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd) /* * "migrate-getmaxdowntime" command */ -static const vshCmdInfo info_migrate_getmaxdowntime[] = { - {.name = "help", - .data = N_("get maximum tolerable downtime") - }, - {.name = "desc", - .data = N_("Get maximum tolerable downtime of a domain which is being live-migrated to another host.") - }, - {.name = NULL} +static const vshCmdInfo info_migrate_getmaxdowntime = { + .help = N_("get maximum tolerable downtime"), + .desc = N_("Get maximum tolerable downtime of a domain which is being live-migrated to another host."), }; static const vshCmdOptDef opts_migrate_getmaxdowntime[] = { @@ -11680,15 +11250,10 @@ cmdMigrateGetMaxDowntime(vshControl *ctl, const vshCmd *cmd) /* * "migrate-compcache" command */ -static const vshCmdInfo info_migrate_compcache[] = { - {.name = "help", - .data = N_("get/set compression cache size") - }, - {.name = "desc", - .data = N_("Get/set size of the cache (in bytes) used for compressing " - "repeatedly transferred memory pages during live migration.") - }, - {.name = NULL} +static const vshCmdInfo info_migrate_compcache = { + .help = N_("get/set compression cache size"), + .desc = N_("Get/set size of the cache (in bytes) used for compressing " + "repeatedly transferred memory pages during live migration."), }; static const vshCmdOptDef opts_migrate_compcache[] = { @@ -11733,15 +11298,10 @@ cmdMigrateCompCache(vshControl *ctl, const vshCmd *cmd) /* * "migrate-setspeed" command */ -static const vshCmdInfo info_migrate_setspeed[] = { - {.name = "help", - .data = N_("Set the maximum migration bandwidth") - }, - {.name = "desc", - .data = N_("Set the maximum migration bandwidth (in MiB/s) for a domain " - "which is being migrated to another host.") - }, - {.name = NULL} +static const vshCmdInfo info_migrate_setspeed = { + .help = N_("Set the maximum migration bandwidth"), + .desc = N_("Set the maximum migration bandwidth (in MiB/s) for a domain " + "which is being migrated to another host."), }; static const vshCmdOptDef opts_migrate_setspeed[] = { @@ -11783,14 +11343,9 @@ cmdMigrateSetMaxSpeed(vshControl *ctl, const vshCmd *cmd) /* * "migrate-getspeed" command */ -static const vshCmdInfo info_migrate_getspeed[] = { - {.name = "help", - .data = N_("Get the maximum migration bandwidth") - }, - {.name = "desc", - .data = N_("Get the maximum migration bandwidth (in MiB/s) for a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_migrate_getspeed = { + .help = N_("Get the maximum migration bandwidth"), + .desc = N_("Get the maximum migration bandwidth (in MiB/s) for a domain."), }; static const vshCmdOptDef opts_migrate_getspeed[] = { @@ -11826,15 +11381,10 @@ cmdMigrateGetMaxSpeed(vshControl *ctl, const vshCmd *cmd) /* * "migrate-postcopy" command */ -static const vshCmdInfo info_migrate_postcopy[] = { - {.name = "help", - .data = N_("Switch running migration from pre-copy to post-copy") - }, - {.name = "desc", - .data = N_("Switch running migration from pre-copy to post-copy. " - "The migration must have been started with --postcopy option.") - }, - {.name = NULL} +static const vshCmdInfo info_migrate_postcopy = { + .help = N_("Switch running migration from pre-copy to post-copy"), + .desc = N_("Switch running migration from pre-copy to post-copy. " + "The migration must have been started with --postcopy option."), }; static const vshCmdOptDef opts_migrate_postcopy[] = { @@ -11859,15 +11409,10 @@ cmdMigratePostCopy(vshControl *ctl, const vshCmd *cmd) /* * "domdisplay" command */ -static const vshCmdInfo info_domdisplay[] = { - {.name = "help", - .data = N_("domain display connection URI") - }, - {.name = "desc", - .data = N_("Output the IP address and port number " - "for the graphical display.") - }, - {.name = NULL} +static const vshCmdInfo info_domdisplay = { + .help = N_("domain display connection URI"), + .desc = N_("Output the IP address and port number " + "for the graphical display."), }; static const vshCmdOptDef opts_domdisplay[] = { @@ -12112,14 +11657,9 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) /* * "vncdisplay" command */ -static const vshCmdInfo info_vncdisplay[] = { - {.name = "help", - .data = N_("vnc display") - }, - {.name = "desc", - .data = N_("Output the IP address and port number for the VNC display.") - }, - {.name = NULL} +static const vshCmdInfo info_vncdisplay = { + .help = N_("vnc display"), + .desc = N_("Output the IP address and port number for the VNC display."), }; static const vshCmdOptDef opts_vncdisplay[] = { @@ -12180,14 +11720,9 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) /* * "ttyconsole" command */ -static const vshCmdInfo info_ttyconsole[] = { - {.name = "help", - .data = N_("tty console") - }, - {.name = "desc", - .data = N_("Output the device for the TTY console.") - }, - {.name = NULL} +static const vshCmdInfo info_ttyconsole = { + .help = N_("tty console"), + .desc = N_("Output the device for the TTY console."), }; static const vshCmdOptDef opts_ttyconsole[] = { @@ -12215,14 +11750,9 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) /* * "domhostname" command */ -static const vshCmdInfo info_domhostname[] = { - {.name = "help", - .data = N_("print the domain's hostname") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_domhostname = { + .help = N_("print the domain's hostname"), + .desc = "", }; static const vshCmdOptDef opts_domhostname[] = { @@ -12287,14 +11817,9 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) /* * "detach-device" command */ -static const vshCmdInfo info_detach_device[] = { - {.name = "help", - .data = N_("detach device from an XML file") - }, - {.name = "desc", - .data = N_("Detach device from an XML <file>") - }, - {.name = NULL} +static const vshCmdInfo info_detach_device = { + .help = N_("detach device from an XML file"), + .desc = N_("Detach device from an XML <file>"), }; static const vshCmdOptDef opts_detach_device[] = { @@ -12363,14 +11888,9 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) /* * "detach-device-alias" command */ -static const vshCmdInfo info_detach_device_alias[] = { - {.name = "help", - .data = N_("detach device from an alias") - }, - {.name = "desc", - .data = N_("Detach device identified by the given alias from a domain") - }, - {.name = NULL} +static const vshCmdInfo info_detach_device_alias = { + .help = N_("detach device from an alias"), + .desc = N_("Detach device identified by the given alias from a domain"), }; static const vshCmdOptDef opts_detach_device_alias[] = { @@ -12424,14 +11944,9 @@ cmdDetachDeviceAlias(vshControl *ctl, const vshCmd *cmd) /* * "update-device" command */ -static const vshCmdInfo info_update_device[] = { - {.name = "help", - .data = N_("update device from an XML file") - }, - {.name = "desc", - .data = N_("Update device from an XML <file>.") - }, - {.name = NULL} +static const vshCmdInfo info_update_device = { + .help = N_("update device from an XML file"), + .desc = N_("Update device from an XML <file>."), }; static const vshCmdOptDef opts_update_device[] = { @@ -12501,14 +12016,9 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) /* * "detach-interface" command */ -static const vshCmdInfo info_detach_interface[] = { - {.name = "help", - .data = N_("detach network interface") - }, - {.name = "desc", - .data = N_("Detach network interface.") - }, - {.name = NULL} +static const vshCmdInfo info_detach_interface = { + .help = N_("detach network interface"), + .desc = N_("Detach network interface."), }; static const vshCmdOptDef opts_detach_interface[] = { @@ -12878,14 +12388,9 @@ virshUpdateDiskXML(xmlNodePtr disk_node, /* * "detach-disk" command */ -static const vshCmdInfo info_detach_disk[] = { - {.name = "help", - .data = N_("detach disk device") - }, - {.name = "desc", - .data = N_("Detach disk device.") - }, - {.name = NULL} +static const vshCmdInfo info_detach_disk = { + .help = N_("detach disk device"), + .desc = N_("Detach disk device."), }; static const vshCmdOptDef opts_detach_disk[] = { @@ -12980,14 +12485,9 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) /* * "edit" command */ -static const vshCmdInfo info_edit[] = { - {.name = "help", - .data = N_("edit XML configuration for a domain") - }, - {.name = "desc", - .data = N_("Edit the XML configuration for a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_edit = { + .help = N_("edit XML configuration for a domain"), + .desc = N_("Edit the XML configuration for a domain."), }; static const vshCmdOptDef opts_edit[] = { @@ -13048,14 +12548,9 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) /* * "change-media" command */ -static const vshCmdInfo info_change_media[] = { - {.name = "help", - .data = N_("Change media of CD or floppy drive") - }, - {.name = "desc", - .data = N_("Change media of CD or floppy drive.") - }, - {.name = NULL} +static const vshCmdInfo info_change_media = { + .help = N_("Change media of CD or floppy drive"), + .desc = N_("Change media of CD or floppy drive."), }; static const vshCmdOptDef opts_change_media[] = { @@ -13202,14 +12697,9 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) return true; } -static const vshCmdInfo info_domfstrim[] = { - {.name = "help", - .data = N_("Invoke fstrim on domain's mounted filesystems.") - }, - {.name = "desc", - .data = N_("Invoke fstrim on domain's mounted filesystems.") - }, - {.name = NULL} +static const vshCmdInfo info_domfstrim = { + .help = N_("Invoke fstrim on domain's mounted filesystems."), + .desc = N_("Invoke fstrim on domain's mounted filesystems."), }; static const vshCmdOptDef opts_domfstrim[] = { @@ -13251,14 +12741,9 @@ cmdDomFSTrim(vshControl *ctl, const vshCmd *cmd) return true; } -static const vshCmdInfo info_domfsfreeze[] = { - {.name = "help", - .data = N_("Freeze domain's mounted filesystems.") - }, - {.name = "desc", - .data = N_("Freeze domain's mounted filesystems.") - }, - {.name = NULL} +static const vshCmdInfo info_domfsfreeze = { + .help = N_("Freeze domain's mounted filesystems."), + .desc = N_("Freeze domain's mounted filesystems."), }; static const vshCmdOptDef opts_domfsfreeze[] = { @@ -13296,14 +12781,9 @@ cmdDomFSFreeze(vshControl *ctl, const vshCmd *cmd) return true; } -static const vshCmdInfo info_domfsthaw[] = { - {.name = "help", - .data = N_("Thaw domain's mounted filesystems.") - }, - {.name = "desc", - .data = N_("Thaw domain's mounted filesystems.") - }, - {.name = NULL} +static const vshCmdInfo info_domfsthaw = { + .help = N_("Thaw domain's mounted filesystems."), + .desc = N_("Thaw domain's mounted filesystems."), }; static const vshCmdOptDef opts_domfsthaw[] = { @@ -13341,14 +12821,9 @@ cmdDomFSThaw(vshControl *ctl, const vshCmd *cmd) return true; } -static const vshCmdInfo info_domfsinfo[] = { - {.name = "help", - .data = N_("Get information of domain's mounted filesystems.") - }, - {.name = "desc", - .data = N_("Get information of domain's mounted filesystems.") - }, - {.name = NULL} +static const vshCmdInfo info_domfsinfo = { + .help = N_("Get information of domain's mounted filesystems."), + .desc = N_("Get information of domain's mounted filesystems."), }; static const vshCmdOptDef opts_domfsinfo[] = { @@ -13424,14 +12899,9 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd) /* * "guest-agent-timeout" command */ -static const vshCmdInfo info_guest_agent_timeout[] = { - {.name = "help", - .data = N_("Set the guest agent timeout") - }, - {.name = "desc", - .data = N_("Set the number of seconds to wait for a response from the guest agent.") - }, - {.name = NULL} +static const vshCmdInfo info_guest_agent_timeout = { + .help = N_("Set the guest agent timeout"), + .desc = N_("Set the number of seconds to wait for a response from the guest agent."), }; static const vshCmdOptDef opts_guest_agent_timeout[] = { @@ -13466,15 +12936,10 @@ cmdGuestAgentTimeout(vshControl *ctl, const vshCmd *cmd) /* * "guestinfo" command */ -static const vshCmdInfo info_guestinfo[] = { - {.name = "help", - .data = N_("query information about the guest (via agent)") - }, - {.name = "desc", - .data = N_("Use the guest agent to query various information from guest's " - "point of view") - }, - {.name = NULL} +static const vshCmdInfo info_guestinfo = { + .help = N_("query information about the guest (via agent)"), + .desc = N_("Use the guest agent to query various information from guest's " + "point of view"), }; static const vshCmdOptDef opts_guestinfo[] = { @@ -13556,15 +13021,10 @@ cmdGuestInfo(vshControl *ctl, const vshCmd *cmd) /* * "get-user-sshkeys" command */ -static const vshCmdInfo info_get_user_sshkeys[] = { - {.name = "help", - .data = N_("list authorized SSH keys for given user (via agent)") - }, - {.name = "desc", - .data = N_("Use the guest agent to query authorized SSH keys for given " - "user") - }, - {.name = NULL} +static const vshCmdInfo info_get_user_sshkeys = { + .help = N_("list authorized SSH keys for given user (via agent)"), + .desc = N_("Use the guest agent to query authorized SSH keys for given " + "user"), }; static const vshCmdOptDef opts_get_user_sshkeys[] = { @@ -13608,15 +13068,10 @@ cmdGetUserSSHKeys(vshControl *ctl, const vshCmd *cmd) /* * "set-user-sshkeys" command */ -static const vshCmdInfo info_set_user_sshkeys[] = { - {.name = "help", - .data = N_("manipulate authorized SSH keys file for given user (via agent)") - }, - {.name = "desc", - .data = N_("Append, reset or remove specified key from the authorized " - "keys file for given user") - }, - {.name = NULL} +static const vshCmdInfo info_set_user_sshkeys = { + .help = N_("manipulate authorized SSH keys file for given user (via agent)"), + .desc = N_("Append, reset or remove specified key from the authorized " + "keys file for given user") }; static const vshCmdOptDef opts_set_user_sshkeys[] = { @@ -13706,17 +13161,12 @@ cmdSetUserSSHKeys(vshControl *ctl, const vshCmd *cmd) /* * "domdirtyrate" command */ -static const vshCmdInfo info_domdirtyrate_calc[] = { - {.name = "help", - .data = N_("Calculate a vm's memory dirty rate") - }, - {.name = "desc", - .data = N_("Calculate memory dirty rate of a domain in order to " +static const vshCmdInfo info_domdirtyrate_calc = { + .help = N_("Calculate a vm's memory dirty rate"), + .desc = N_("Calculate memory dirty rate of a domain in order to " "decide whether it's proper to be migrated out or not.\n" "The calculated dirty rate information is available by " - "calling 'domstats --dirtyrate'.") - }, - {.name = NULL} + "calling 'domstats --dirtyrate'."), }; static const vshCmdOptDef opts_domdirtyrate_calc[] = { @@ -13792,14 +13242,9 @@ cmdDomDirtyRateCalc(vshControl *ctl, const vshCmd *cmd) /** * "domdisplay-reload" command */ -static const vshCmdInfo info_domdisplay_reload[] = { - {.name = "help", - .data = N_("Reload domain's graphics display certificates") - }, - {.name = "desc", - .data = N_("Reload domain's graphics display certificates") - }, - {.name = NULL} +static const vshCmdInfo info_domdisplay_reload = { + .help = N_("Reload domain's graphics display certificates"), + .desc = N_("Reload domain's graphics display certificates"), }; static const vshCmdOptDef opts_domdisplay_reload[] = { @@ -13833,669 +13278,669 @@ const vshCmdDef domManagementCmds[] = { {.name = "attach-device", .handler = cmdAttachDevice, .opts = opts_attach_device, - .info = info_attach_device, + .info = &info_attach_device, .flags = 0 }, {.name = "attach-disk", .handler = cmdAttachDisk, .opts = opts_attach_disk, - .info = info_attach_disk, + .info = &info_attach_disk, .flags = 0 }, {.name = "attach-interface", .handler = cmdAttachInterface, .opts = opts_attach_interface, - .info = info_attach_interface, + .info = &info_attach_interface, .flags = 0 }, {.name = "autostart", .handler = cmdAutostart, .opts = opts_autostart, - .info = info_autostart, + .info = &info_autostart, .flags = 0 }, {.name = "blkdeviotune", .handler = cmdBlkdeviotune, .opts = opts_blkdeviotune, - .info = info_blkdeviotune, + .info = &info_blkdeviotune, .flags = 0 }, {.name = "blkiotune", .handler = cmdBlkiotune, .opts = opts_blkiotune, - .info = info_blkiotune, + .info = &info_blkiotune, .flags = 0 }, {.name = "blockcommit", .handler = cmdBlockcommit, .opts = opts_blockcommit, - .info = info_blockcommit, + .info = &info_blockcommit, .flags = 0 }, {.name = "blockcopy", .handler = cmdBlockcopy, .opts = opts_blockcopy, - .info = info_blockcopy, + .info = &info_blockcopy, .flags = 0 }, {.name = "blockjob", .handler = cmdBlockjob, .opts = opts_blockjob, - .info = info_blockjob, + .info = &info_blockjob, .flags = 0 }, {.name = "blockpull", .handler = cmdBlockpull, .opts = opts_blockpull, - .info = info_blockpull, + .info = &info_blockpull, .flags = 0 }, {.name = "blockresize", .handler = cmdBlockresize, .opts = opts_blockresize, - .info = info_blockresize, + .info = &info_blockresize, .flags = 0 }, {.name = "change-media", .handler = cmdChangeMedia, .opts = opts_change_media, - .info = info_change_media, + .info = &info_change_media, .flags = 0 }, #ifndef WIN32 {.name = "console", .handler = cmdConsole, .opts = opts_console, - .info = info_console, + .info = &info_console, .flags = 0 }, #endif {.name = "cpu-stats", .handler = cmdCPUStats, .opts = opts_cpu_stats, - .info = info_cpu_stats, + .info = &info_cpu_stats, .flags = 0 }, {.name = "create", .handler = cmdCreate, .opts = opts_create, - .info = info_create, + .info = &info_create, .flags = 0 }, {.name = "define", .handler = cmdDefine, .opts = opts_define, - .info = info_define, + .info = &info_define, .flags = 0 }, {.name = "desc", .handler = cmdDesc, .opts = opts_desc, - .info = info_desc, + .info = &info_desc, .flags = 0 }, {.name = "destroy", .handler = cmdDestroy, .opts = opts_destroy, - .info = info_destroy, + .info = &info_destroy, .flags = 0 }, {.name = "detach-device", .handler = cmdDetachDevice, .opts = opts_detach_device, - .info = info_detach_device, + .info = &info_detach_device, .flags = 0 }, {.name = "detach-device-alias", .handler = cmdDetachDeviceAlias, .opts = opts_detach_device_alias, - .info = info_detach_device_alias, + .info = &info_detach_device_alias, .flags = 0 }, {.name = "detach-disk", .handler = cmdDetachDisk, .opts = opts_detach_disk, - .info = info_detach_disk, + .info = &info_detach_disk, .flags = 0 }, {.name = "detach-interface", .handler = cmdDetachInterface, .opts = opts_detach_interface, - .info = info_detach_interface, + .info = &info_detach_interface, .flags = 0 }, {.name = "domdisplay", .handler = cmdDomDisplay, .opts = opts_domdisplay, - .info = info_domdisplay, + .info = &info_domdisplay, .flags = 0 }, {.name = "domfsfreeze", .handler = cmdDomFSFreeze, .opts = opts_domfsfreeze, - .info = info_domfsfreeze, + .info = &info_domfsfreeze, .flags = 0 }, {.name = "domfsthaw", .handler = cmdDomFSThaw, .opts = opts_domfsthaw, - .info = info_domfsthaw, + .info = &info_domfsthaw, .flags = 0 }, {.name = "domfsinfo", .handler = cmdDomFSInfo, .opts = opts_domfsinfo, - .info = info_domfsinfo, + .info = &info_domfsinfo, .flags = 0 }, {.name = "domfstrim", .handler = cmdDomFSTrim, .opts = opts_domfstrim, - .info = info_domfstrim, + .info = &info_domfstrim, .flags = 0 }, {.name = "domhostname", .handler = cmdDomHostname, .opts = opts_domhostname, - .info = info_domhostname, + .info = &info_domhostname, .flags = 0 }, {.name = "domid", .handler = cmdDomid, .opts = opts_domid, - .info = info_domid, + .info = &info_domid, .flags = 0 }, {.name = "domif-setlink", .handler = cmdDomIfSetLink, .opts = opts_domif_setlink, - .info = info_domif_setlink, + .info = &info_domif_setlink, .flags = 0 }, {.name = "domiftune", .handler = cmdDomIftune, .opts = opts_domiftune, - .info = info_domiftune, + .info = &info_domiftune, .flags = 0 }, {.name = "domjobabort", .handler = cmdDomjobabort, .opts = opts_domjobabort, - .info = info_domjobabort, + .info = &info_domjobabort, .flags = 0 }, {.name = "domjobinfo", .handler = cmdDomjobinfo, .opts = opts_domjobinfo, - .info = info_domjobinfo, + .info = &info_domjobinfo, .flags = 0 }, {.name = "domlaunchsecinfo", .handler = cmdDomLaunchSecInfo, .opts = opts_domlaunchsecinfo, - .info = info_domlaunchsecinfo, + .info = &info_domlaunchsecinfo, .flags = 0 }, {.name = "domsetlaunchsecstate", .handler = cmdDomSetLaunchSecState, .opts = opts_domsetlaunchsecstate, - .info = info_domsetlaunchsecstate, + .info = &info_domsetlaunchsecstate, .flags = 0 }, {.name = "domname", .handler = cmdDomname, .opts = opts_domname, - .info = info_domname, + .info = &info_domname, .flags = 0 }, {.name = "domrename", .handler = cmdDomrename, .opts = opts_domrename, - .info = info_domrename, + .info = &info_domrename, .flags = 0 }, {.name = "dompmsuspend", .handler = cmdDomPMSuspend, .opts = opts_dom_pm_suspend, - .info = info_dom_pm_suspend, + .info = &info_dom_pm_suspend, .flags = 0 }, {.name = "dompmwakeup", .handler = cmdDomPMWakeup, .opts = opts_dom_pm_wakeup, - .info = info_dom_pm_wakeup, + .info = &info_dom_pm_wakeup, .flags = 0 }, {.name = "domuuid", .handler = cmdDomuuid, .opts = opts_domuuid, - .info = info_domuuid, + .info = &info_domuuid, .flags = 0 }, {.name = "domxml-from-native", .handler = cmdDomXMLFromNative, .opts = opts_domxmlfromnative, - .info = info_domxmlfromnative, + .info = &info_domxmlfromnative, .flags = 0 }, {.name = "domxml-to-native", .handler = cmdDomXMLToNative, .opts = opts_domxmltonative, - .info = info_domxmltonative, + .info = &info_domxmltonative, .flags = 0 }, {.name = "dump", .handler = cmdDump, .opts = opts_dump, - .info = info_dump, + .info = &info_dump, .flags = 0 }, {.name = "dumpxml", .handler = cmdDumpXML, .opts = opts_dumpxml, - .info = info_dumpxml, + .info = &info_dumpxml, .flags = 0 }, {.name = "edit", .handler = cmdEdit, .opts = opts_edit, - .info = info_edit, + .info = &info_edit, .flags = 0 }, {.name = "get-user-sshkeys", .handler = cmdGetUserSSHKeys, .opts = opts_get_user_sshkeys, - .info = info_get_user_sshkeys, + .info = &info_get_user_sshkeys, .flags = 0 }, {.name = "inject-nmi", .handler = cmdInjectNMI, .opts = opts_inject_nmi, - .info = info_inject_nmi, + .info = &info_inject_nmi, .flags = 0 }, {.name = "iothreadinfo", .handler = cmdIOThreadInfo, .opts = opts_iothreadinfo, - .info = info_iothreadinfo, + .info = &info_iothreadinfo, .flags = 0 }, {.name = "iothreadpin", .handler = cmdIOThreadPin, .opts = opts_iothreadpin, - .info = info_iothreadpin, + .info = &info_iothreadpin, .flags = 0 }, {.name = "iothreadadd", .handler = cmdIOThreadAdd, .opts = opts_iothreadadd, - .info = info_iothreadadd, + .info = &info_iothreadadd, .flags = 0 }, {.name = "iothreadset", .handler = cmdIOThreadSet, .opts = opts_iothreadset, - .info = info_iothreadset, + .info = &info_iothreadset, .flags = 0 }, {.name = "iothreaddel", .handler = cmdIOThreadDel, .opts = opts_iothreaddel, - .info = info_iothreaddel, + .info = &info_iothreaddel, .flags = 0 }, {.name = "send-key", .handler = cmdSendKey, .opts = opts_send_key, - .info = info_send_key, + .info = &info_send_key, .flags = 0 }, {.name = "send-process-signal", .handler = cmdSendProcessSignal, .opts = opts_send_process_signal, - .info = info_send_process_signal, + .info = &info_send_process_signal, .flags = 0 }, {.name = "lxc-enter-namespace", .handler = cmdLxcEnterNamespace, .opts = opts_lxc_enter_namespace, - .info = info_lxc_enter_namespace, + .info = &info_lxc_enter_namespace, .flags = 0 }, {.name = "managedsave", .handler = cmdManagedSave, .opts = opts_managedsave, - .info = info_managedsave, + .info = &info_managedsave, .flags = 0 }, {.name = "managedsave-remove", .handler = cmdManagedSaveRemove, .opts = opts_managedsaveremove, - .info = info_managedsaveremove, + .info = &info_managedsaveremove, .flags = 0 }, {.name = "managedsave-edit", .handler = cmdManagedSaveEdit, .opts = opts_managed_save_edit, - .info = info_managed_save_edit, + .info = &info_managed_save_edit, .flags = 0 }, {.name = "managedsave-dumpxml", .handler = cmdManagedSaveDumpxml, .opts = opts_managed_save_dumpxml, - .info = info_managed_save_dumpxml, + .info = &info_managed_save_dumpxml, .flags = 0 }, {.name = "managedsave-define", .handler = cmdManagedSaveDefine, .opts = opts_managed_save_define, - .info = info_managed_save_define, + .info = &info_managed_save_define, .flags = 0 }, {.name = "memtune", .handler = cmdMemtune, .opts = opts_memtune, - .info = info_memtune, + .info = &info_memtune, .flags = 0 }, {.name = "perf", .handler = cmdPerf, .opts = opts_perf, - .info = info_perf, + .info = &info_perf, .flags = 0 }, {.name = "metadata", .handler = cmdMetadata, .opts = opts_metadata, - .info = info_metadata, + .info = &info_metadata, .flags = 0 }, {.name = "migrate", .handler = cmdMigrate, .opts = opts_migrate, - .info = info_migrate, + .info = &info_migrate, .flags = 0 }, {.name = "migrate-setmaxdowntime", .handler = cmdMigrateSetMaxDowntime, .opts = opts_migrate_setmaxdowntime, - .info = info_migrate_setmaxdowntime, + .info = &info_migrate_setmaxdowntime, .flags = 0 }, {.name = "migrate-getmaxdowntime", .handler = cmdMigrateGetMaxDowntime, .opts = opts_migrate_getmaxdowntime, - .info = info_migrate_getmaxdowntime, + .info = &info_migrate_getmaxdowntime, .flags = 0 }, {.name = "migrate-compcache", .handler = cmdMigrateCompCache, .opts = opts_migrate_compcache, - .info = info_migrate_compcache, + .info = &info_migrate_compcache, .flags = 0 }, {.name = "migrate-setspeed", .handler = cmdMigrateSetMaxSpeed, .opts = opts_migrate_setspeed, - .info = info_migrate_setspeed, + .info = &info_migrate_setspeed, .flags = 0 }, {.name = "migrate-getspeed", .handler = cmdMigrateGetMaxSpeed, .opts = opts_migrate_getspeed, - .info = info_migrate_getspeed, + .info = &info_migrate_getspeed, .flags = 0 }, {.name = "migrate-postcopy", .handler = cmdMigratePostCopy, .opts = opts_migrate_postcopy, - .info = info_migrate_postcopy, + .info = &info_migrate_postcopy, .flags = 0 }, {.name = "numatune", .handler = cmdNumatune, .opts = opts_numatune, - .info = info_numatune, + .info = &info_numatune, .flags = 0 }, {.name = "qemu-attach", .handler = cmdQemuAttach, .opts = opts_qemu_attach, - .info = info_qemu_attach, + .info = &info_qemu_attach, .flags = 0 }, {.name = "qemu-monitor-command", .handler = cmdQemuMonitorCommand, .opts = opts_qemu_monitor_command, - .info = info_qemu_monitor_command, + .info = &info_qemu_monitor_command, .flags = 0 }, {.name = "qemu-monitor-event", .handler = cmdQemuMonitorEvent, .opts = opts_qemu_monitor_event, - .info = info_qemu_monitor_event, + .info = &info_qemu_monitor_event, .flags = 0 }, {.name = "qemu-agent-command", .handler = cmdQemuAgentCommand, .opts = opts_qemu_agent_command, - .info = info_qemu_agent_command, + .info = &info_qemu_agent_command, .flags = 0 }, {.name = "guest-agent-timeout", .handler = cmdGuestAgentTimeout, .opts = opts_guest_agent_timeout, - .info = info_guest_agent_timeout, + .info = &info_guest_agent_timeout, .flags = 0 }, {.name = "reboot", .handler = cmdReboot, .opts = opts_reboot, - .info = info_reboot, + .info = &info_reboot, .flags = 0 }, {.name = "reset", .handler = cmdReset, .opts = opts_reset, - .info = info_reset, + .info = &info_reset, .flags = 0 }, {.name = "restore", .handler = cmdRestore, .opts = opts_restore, - .info = info_restore, + .info = &info_restore, .flags = 0 }, {.name = "resume", .handler = cmdResume, .opts = opts_resume, - .info = info_resume, + .info = &info_resume, .flags = 0 }, {.name = "save", .handler = cmdSave, .opts = opts_save, - .info = info_save, + .info = &info_save, .flags = 0 }, {.name = "save-image-define", .handler = cmdSaveImageDefine, .opts = opts_save_image_define, - .info = info_save_image_define, + .info = &info_save_image_define, .flags = 0 }, {.name = "save-image-dumpxml", .handler = cmdSaveImageDumpxml, .opts = opts_save_image_dumpxml, - .info = info_save_image_dumpxml, + .info = &info_save_image_dumpxml, .flags = 0 }, {.name = "save-image-edit", .handler = cmdSaveImageEdit, .opts = opts_save_image_edit, - .info = info_save_image_edit, + .info = &info_save_image_edit, .flags = 0 }, {.name = "schedinfo", .handler = cmdSchedinfo, .opts = opts_schedinfo, - .info = info_schedinfo, + .info = &info_schedinfo, .flags = 0 }, {.name = "screenshot", .handler = cmdScreenshot, .opts = opts_screenshot, - .info = info_screenshot, + .info = &info_screenshot, .flags = 0 }, {.name = "set-lifecycle-action", .handler = cmdSetLifecycleAction, .opts = opts_setLifecycleAction, - .info = info_setLifecycleAction, + .info = &info_setLifecycleAction, .flags = 0 }, {.name = "set-user-sshkeys", .handler = cmdSetUserSSHKeys, .opts = opts_set_user_sshkeys, - .info = info_set_user_sshkeys, + .info = &info_set_user_sshkeys, .flags = 0 }, {.name = "set-user-password", .handler = cmdSetUserPassword, .opts = opts_set_user_password, - .info = info_set_user_password, + .info = &info_set_user_password, .flags = 0 }, {.name = "setmaxmem", .handler = cmdSetmaxmem, .opts = opts_setmaxmem, - .info = info_setmaxmem, + .info = &info_setmaxmem, .flags = 0 }, {.name = "setmem", .handler = cmdSetmem, .opts = opts_setmem, - .info = info_setmem, + .info = &info_setmem, .flags = 0 }, {.name = "setvcpus", .handler = cmdSetvcpus, .opts = opts_setvcpus, - .info = info_setvcpus, + .info = &info_setvcpus, .flags = 0 }, {.name = "shutdown", .handler = cmdShutdown, .opts = opts_shutdown, - .info = info_shutdown, + .info = &info_shutdown, .flags = 0 }, {.name = "start", .handler = cmdStart, .opts = opts_start, - .info = info_start, + .info = &info_start, .flags = 0 }, {.name = "suspend", .handler = cmdSuspend, .opts = opts_suspend, - .info = info_suspend, + .info = &info_suspend, .flags = 0 }, {.name = "ttyconsole", .handler = cmdTTYConsole, .opts = opts_ttyconsole, - .info = info_ttyconsole, + .info = &info_ttyconsole, .flags = 0 }, {.name = "undefine", .handler = cmdUndefine, .opts = opts_undefine, - .info = info_undefine, + .info = &info_undefine, .flags = 0 }, {.name = "update-device", .handler = cmdUpdateDevice, .opts = opts_update_device, - .info = info_update_device, + .info = &info_update_device, .flags = 0 }, {.name = "update-memory-device", .handler = cmdUpdateMemoryDevice, .opts = opts_update_memory_device, - .info = info_update_memory_device, + .info = &info_update_memory_device, .flags = 0 }, {.name = "vcpucount", .handler = cmdVcpucount, .opts = opts_vcpucount, - .info = info_vcpucount, + .info = &info_vcpucount, .flags = 0 }, {.name = "vcpuinfo", .handler = cmdVcpuinfo, .opts = opts_vcpuinfo, - .info = info_vcpuinfo, + .info = &info_vcpuinfo, .flags = 0 }, {.name = "vcpupin", .handler = cmdVcpuPin, .opts = opts_vcpupin, - .info = info_vcpupin, + .info = &info_vcpupin, .flags = 0 }, {.name = "emulatorpin", .handler = cmdEmulatorPin, .opts = opts_emulatorpin, - .info = info_emulatorpin, + .info = &info_emulatorpin, .flags = 0 }, {.name = "vncdisplay", .handler = cmdVNCDisplay, .opts = opts_vncdisplay, - .info = info_vncdisplay, + .info = &info_vncdisplay, .flags = 0 }, {.name = "guestvcpus", .handler = cmdGuestvcpus, .opts = opts_guestvcpus, - .info = info_guestvcpus, + .info = &info_guestvcpus, .flags = 0 }, {.name = "setvcpu", .handler = cmdSetvcpu, .opts = opts_setvcpu, - .info = info_setvcpu, + .info = &info_setvcpu, .flags = 0 }, {.name = "domblkthreshold", .handler = cmdDomblkthreshold, .opts = opts_domblkthreshold, - .info = info_domblkthreshold, + .info = &info_domblkthreshold, .flags = 0 }, {.name = "guestinfo", .handler = cmdGuestInfo, .opts = opts_guestinfo, - .info = info_guestinfo, + .info = &info_guestinfo, .flags = 0 }, {.name = "domdirtyrate-calc", .handler = cmdDomDirtyRateCalc, .opts = opts_domdirtyrate_calc, - .info = info_domdirtyrate_calc, + .info = &info_domdirtyrate_calc, .flags = 0 }, {.name = "dom-fd-associate", .handler = cmdDomFdAssociate, .opts = opts_dom_fd_associate, - .info = info_dom_fd_associate, + .info = &info_dom_fd_associate, .flags = 0 }, {.name = "domdisplay-reload", .handler = cmdDomdisplayReload, .opts = opts_domdisplay_reload, - .info = info_domdisplay_reload, + .info = &info_domdisplay_reload, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 87443220bd..1a97f4926b 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -37,14 +37,9 @@ /* * "capabilities" command */ -static const vshCmdInfo info_capabilities[] = { - {.name = "help", - .data = N_("capabilities") - }, - {.name = "desc", - .data = N_("Returns capabilities of hypervisor/driver.") - }, - {.name = NULL} +static const vshCmdInfo info_capabilities = { + .help = N_("capabilities"), + .desc = N_("Returns capabilities of hypervisor/driver."), }; static const vshCmdOptDef opts_capabilities[] = { @@ -83,14 +78,9 @@ cmdCapabilities(vshControl *ctl, const vshCmd *cmd) /* * "domcapabilities" command */ -static const vshCmdInfo info_domcapabilities[] = { - {.name = "help", - .data = N_("domain capabilities") - }, - {.name = "desc", - .data = N_("Returns capabilities of emulator with respect to host and libvirt.") - }, - {.name = NULL} +static const vshCmdInfo info_domcapabilities = { + .help = N_("domain capabilities"), + .desc = N_("Returns capabilities of emulator with respect to host and libvirt."), }; static const vshCmdOptDef opts_domcapabilities[] = { @@ -158,14 +148,9 @@ cmdDomCapabilities(vshControl *ctl, const vshCmd *cmd) /* * "freecell" command */ -static const vshCmdInfo info_freecell[] = { - {.name = "help", - .data = N_("NUMA free memory") - }, - {.name = "desc", - .data = N_("display available free memory for the NUMA cell.") - }, - {.name = NULL} +static const vshCmdInfo info_freecell = { + .help = N_("NUMA free memory"), + .desc = N_("display available free memory for the NUMA cell."), }; static const vshCmdOptDef opts_freecell[] = { @@ -271,14 +256,9 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) /* * "freepages" command */ -static const vshCmdInfo info_freepages[] = { - {.name = "help", - .data = N_("NUMA free pages") - }, - {.name = "desc", - .data = N_("display available free pages for the NUMA cell.") - }, - {.name = NULL} +static const vshCmdInfo info_freepages = { + .help = N_("NUMA free pages"), + .desc = N_("display available free pages for the NUMA cell."), }; static const vshCmdOptDef opts_freepages[] = { @@ -481,14 +461,9 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd) /* * "allocpages" command */ -static const vshCmdInfo info_allocpages[] = { - {.name = "help", - .data = N_("Manipulate pages pool size") - }, - {.name = "desc", - .data = N_("Allocate or free some pages in the pool for NUMA cell.") - }, - {.name = NULL} +static const vshCmdInfo info_allocpages = { + .help = N_("Manipulate pages pool size"), + .desc = N_("Allocate or free some pages in the pool for NUMA cell."), }; static const vshCmdOptDef opts_allocpages[] = { {.name = "pagesize", @@ -597,14 +572,9 @@ cmdAllocpages(vshControl *ctl, const vshCmd *cmd) /* * "maxvcpus" command */ -static const vshCmdInfo info_maxvcpus[] = { - {.name = "help", - .data = N_("connection vcpu maximum") - }, - {.name = "desc", - .data = N_("Show maximum number of virtual CPUs for guests on this connection.") - }, - {.name = NULL} +static const vshCmdInfo info_maxvcpus = { + .help = N_("connection vcpu maximum"), + .desc = N_("Show maximum number of virtual CPUs for guests on this connection."), }; static const vshCmdOptDef opts_maxvcpus[] = { @@ -650,14 +620,9 @@ cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) /* * "nodeinfo" command */ -static const vshCmdInfo info_nodeinfo[] = { - {.name = "help", - .data = N_("node information") - }, - {.name = "desc", - .data = N_("Returns basic information about the node.") - }, - {.name = NULL} +static const vshCmdInfo info_nodeinfo = { + .help = N_("node information"), + .desc = N_("Returns basic information about the node."), }; static bool @@ -686,15 +651,10 @@ cmdNodeinfo(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "nodecpumap" command */ -static const vshCmdInfo info_node_cpumap[] = { - {.name = "help", - .data = N_("node cpu map") - }, - {.name = "desc", - .data = N_("Displays the node's total number of CPUs, the number of" - " online CPUs and the list of online CPUs.") - }, - {.name = NULL} +static const vshCmdInfo info_node_cpumap = { + .help = N_("node cpu map"), + .desc = N_("Displays the node's total number of CPUs, the number of" + " online CPUs and the list of online CPUs."), }; static const vshCmdOptDef opts_node_cpumap[] = { @@ -742,14 +702,9 @@ cmdNodeCpuMap(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "nodecpustats" command */ -static const vshCmdInfo info_nodecpustats[] = { - {.name = "help", - .data = N_("Prints cpu stats of the node.") - }, - {.name = "desc", - .data = N_("Returns cpu stats of the node, in nanoseconds.") - }, - {.name = NULL} +static const vshCmdInfo info_nodecpustats = { + .help = N_("Prints cpu stats of the node."), + .desc = N_("Returns cpu stats of the node, in nanoseconds."), }; static const vshCmdOptDef opts_node_cpustats[] = { @@ -885,14 +840,9 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) /* * "nodememstats" command */ -static const vshCmdInfo info_nodememstats[] = { - {.name = "help", - .data = N_("Prints memory stats of the node.") - }, - {.name = "desc", - .data = N_("Returns memory stats of the node, in kilobytes.") - }, - {.name = NULL} +static const vshCmdInfo info_nodememstats = { + .help = N_("Prints memory stats of the node."), + .desc = N_("Returns memory stats of the node, in kilobytes."), }; static const vshCmdOptDef opts_node_memstats[] = { @@ -943,14 +893,9 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) /* * "nodesevinfo" command */ -static const vshCmdInfo info_nodesevinfo[] = { - {.name = "help", - .data = N_("node SEV information") - }, - {.name = "desc", - .data = N_("Returns basic SEV information about the node.") - }, - {.name = NULL} +static const vshCmdInfo info_nodesevinfo = { + .help = N_("node SEV information"), + .desc = N_("Returns basic SEV information about the node."), }; static bool @@ -989,15 +934,10 @@ VIR_ENUM_IMPL(virshNodeSuspendTarget, "disk", "hybrid"); -static const vshCmdInfo info_nodesuspend[] = { - {.name = "help", - .data = N_("suspend the host node for a given time duration") - }, - {.name = "desc", - .data = N_("Suspend the host node for a given time duration " - "and attempt to resume thereafter.") - }, - {.name = NULL} +static const vshCmdInfo info_nodesuspend = { + .help = N_("suspend the host node for a given time duration"), + .desc = N_("Suspend the host node for a given time duration " + "and attempt to resume thereafter."), }; static const vshCmdOptDef opts_node_suspend[] = { @@ -1050,14 +990,9 @@ cmdNodeSuspend(vshControl *ctl, const vshCmd *cmd) /* * "sysinfo" command */ -static const vshCmdInfo info_sysinfo[] = { - {.name = "help", - .data = N_("print the hypervisor sysinfo") - }, - {.name = "desc", - .data = N_("output an XML string for the hypervisor sysinfo, if available") - }, - {.name = NULL} +static const vshCmdInfo info_sysinfo = { + .help = N_("print the hypervisor sysinfo"), + .desc = N_("output an XML string for the hypervisor sysinfo, if available"), }; static bool @@ -1080,14 +1015,9 @@ cmdSysinfo(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "hostname" command */ -static const vshCmdInfo info_hostname[] = { - {.name = "help", - .data = N_("print the hypervisor hostname") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_hostname = { + .help = N_("print the hypervisor hostname"), + .desc = "", }; static bool @@ -1110,14 +1040,9 @@ cmdHostname(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "uri" command */ -static const vshCmdInfo info_uri[] = { - {.name = "help", - .data = N_("print the hypervisor canonical URI") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_uri = { + .help = N_("print the hypervisor canonical URI"), + .desc = "", }; static bool @@ -1218,14 +1143,9 @@ vshExtractCPUDefXMLs(vshControl *ctl, /* * "cpu-compare" command */ -static const vshCmdInfo info_cpu_compare[] = { - {.name = "help", - .data = N_("compare host CPU with a CPU described by an XML file") - }, - {.name = "desc", - .data = N_("compare CPU with host CPU") - }, - {.name = NULL} +static const vshCmdInfo info_cpu_compare = { + .help = N_("compare host CPU with a CPU described by an XML file"), + .desc = N_("compare CPU with host CPU"), }; static const vshCmdOptDef opts_cpu_compare[] = { @@ -1293,14 +1213,9 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) /* * "cpu-baseline" command */ -static const vshCmdInfo info_cpu_baseline[] = { - {.name = "help", - .data = N_("compute baseline CPU") - }, - {.name = "desc", - .data = N_("Compute baseline CPU for a set of given CPUs.") - }, - {.name = NULL} +static const vshCmdInfo info_cpu_baseline = { + .help = N_("compute baseline CPU"), + .desc = N_("Compute baseline CPU for a set of given CPUs."), }; static const vshCmdOptDef opts_cpu_baseline[] = { @@ -1347,14 +1262,9 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) /* * "cpu-models" command */ -static const vshCmdInfo info_cpu_models[] = { - {.name = "help", - .data = N_("CPU models") - }, - {.name = "desc", - .data = N_("Get the CPU models for an arch.") - }, - {.name = NULL} +static const vshCmdInfo info_cpu_models = { + .help = N_("CPU models"), + .desc = N_("Get the CPU models for an arch."), }; static const vshCmdOptDef opts_cpu_models[] = { @@ -1401,14 +1311,9 @@ cmdCPUModelNames(vshControl *ctl, const vshCmd *cmd) /* * "version" command */ -static const vshCmdInfo info_version[] = { - {.name = "help", - .data = N_("show version") - }, - {.name = "desc", - .data = N_("Display the system version information.") - }, - {.name = NULL} +static const vshCmdInfo info_version = { + .help = N_("show version"), + .desc = N_("Display the system version information."), }; static const vshCmdOptDef opts_version[] = { @@ -1503,10 +1408,9 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) return true; } -static const vshCmdInfo info_node_memory_tune[] = { - {"help", N_("Get or set node memory parameters")}, - {"desc", N_("Get or set node memory parameters")}, - {NULL, NULL} +static const vshCmdInfo info_node_memory_tune = { + .help = N_("Get or set node memory parameters"), + .desc = N_("Get or set node memory parameters"), }; static const vshCmdOptDef opts_node_memory_tune[] = { @@ -1617,14 +1521,9 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) /* * "hypervisor-cpu-compare" command */ -static const vshCmdInfo info_hypervisor_cpu_compare[] = { - {.name = "help", - .data = N_("compare a CPU with the CPU created by a hypervisor on the host") - }, - {.name = "desc", - .data = N_("compare CPU with hypervisor CPU") - }, - {.name = NULL} +static const vshCmdInfo info_hypervisor_cpu_compare = { + .help = N_("compare a CPU with the CPU created by a hypervisor on the host"), + .desc = N_("compare CPU with hypervisor CPU"), }; static const vshCmdOptDef opts_hypervisor_cpu_compare[] = { @@ -1724,15 +1623,10 @@ cmdHypervisorCPUCompare(vshControl *ctl, /* * "hypervisor-cpu-baseline" command */ -static const vshCmdInfo info_hypervisor_cpu_baseline[] = { - {.name = "help", - .data = N_("compute baseline CPU usable by a specific hypervisor") - }, - {.name = "desc", - .data = N_("Compute baseline CPU for a set of given CPUs. The result " - "will be tailored to the specified hypervisor.") - }, - {.name = NULL} +static const vshCmdInfo info_hypervisor_cpu_baseline = { + .help = N_("compute baseline CPU usable by a specific hypervisor"), + .desc = N_("Compute baseline CPU for a set of given CPUs. The result " + "will be tailored to the specified hypervisor."), }; static const vshCmdOptDef opts_hypervisor_cpu_baseline[] = { @@ -1831,133 +1725,133 @@ const vshCmdDef hostAndHypervisorCmds[] = { {.name = "allocpages", .handler = cmdAllocpages, .opts = opts_allocpages, - .info = info_allocpages, + .info = &info_allocpages, .flags = 0 }, {.name = "capabilities", .handler = cmdCapabilities, .opts = opts_capabilities, - .info = info_capabilities, + .info = &info_capabilities, .flags = 0 }, {.name = "cpu-baseline", .handler = cmdCPUBaseline, .opts = opts_cpu_baseline, - .info = info_cpu_baseline, + .info = &info_cpu_baseline, .flags = 0 }, {.name = "cpu-compare", .handler = cmdCPUCompare, .opts = opts_cpu_compare, - .info = info_cpu_compare, + .info = &info_cpu_compare, .flags = 0 }, {.name = "cpu-models", .handler = cmdCPUModelNames, .opts = opts_cpu_models, - .info = info_cpu_models, + .info = &info_cpu_models, .flags = 0 }, {.name = "domcapabilities", .handler = cmdDomCapabilities, .opts = opts_domcapabilities, - .info = info_domcapabilities, + .info = &info_domcapabilities, .flags = 0 }, {.name = "freecell", .handler = cmdFreecell, .opts = opts_freecell, - .info = info_freecell, + .info = &info_freecell, .flags = 0 }, {.name = "freepages", .handler = cmdFreepages, .opts = opts_freepages, - .info = info_freepages, + .info = &info_freepages, .flags = 0 }, {.name = "hostname", .handler = cmdHostname, .opts = NULL, - .info = info_hostname, + .info = &info_hostname, .flags = 0 }, {.name = "hypervisor-cpu-baseline", .handler = cmdHypervisorCPUBaseline, .opts = opts_hypervisor_cpu_baseline, - .info = info_hypervisor_cpu_baseline, + .info = &info_hypervisor_cpu_baseline, .flags = 0 }, {.name = "hypervisor-cpu-compare", .handler = cmdHypervisorCPUCompare, .opts = opts_hypervisor_cpu_compare, - .info = info_hypervisor_cpu_compare, + .info = &info_hypervisor_cpu_compare, .flags = 0 }, {.name = "maxvcpus", .handler = cmdMaxvcpus, .opts = opts_maxvcpus, - .info = info_maxvcpus, + .info = &info_maxvcpus, .flags = 0 }, {.name = "node-memory-tune", .handler = cmdNodeMemoryTune, .opts = opts_node_memory_tune, - .info = info_node_memory_tune, + .info = &info_node_memory_tune, .flags = 0 }, {.name = "nodecpumap", .handler = cmdNodeCpuMap, .opts = opts_node_cpumap, - .info = info_node_cpumap, + .info = &info_node_cpumap, .flags = 0 }, {.name = "nodecpustats", .handler = cmdNodeCpuStats, .opts = opts_node_cpustats, - .info = info_nodecpustats, + .info = &info_nodecpustats, .flags = 0 }, {.name = "nodeinfo", .handler = cmdNodeinfo, .opts = NULL, - .info = info_nodeinfo, + .info = &info_nodeinfo, .flags = 0 }, {.name = "nodememstats", .handler = cmdNodeMemStats, .opts = opts_node_memstats, - .info = info_nodememstats, + .info = &info_nodememstats, .flags = 0 }, {.name = "nodesevinfo", .handler = cmdNodeSEVInfo, .opts = NULL, - .info = info_nodesevinfo, + .info = &info_nodesevinfo, .flags = 0 }, {.name = "nodesuspend", .handler = cmdNodeSuspend, .opts = opts_node_suspend, - .info = info_nodesuspend, + .info = &info_nodesuspend, .flags = 0 }, {.name = "sysinfo", .handler = cmdSysinfo, .opts = NULL, - .info = info_sysinfo, + .info = &info_sysinfo, .flags = 0 }, {.name = "uri", .handler = cmdURI, .opts = NULL, - .info = info_uri, + .info = &info_uri, .flags = 0 }, {.name = "version", .handler = cmdVersion, .opts = opts_version, - .info = info_version, + .info = &info_version, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 09a3668438..5dde4f9d46 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -91,14 +91,9 @@ virshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, /* * "iface-edit" command */ -static const vshCmdInfo info_interface_edit[] = { - {.name = "help", - .data = N_("edit XML configuration for a physical host interface") - }, - {.name = "desc", - .data = N_("Edit the XML configuration for a physical host interface.") - }, - {.name = NULL} +static const vshCmdInfo info_interface_edit = { + .help = N_("edit XML configuration for a physical host interface"), + .desc = N_("Edit the XML configuration for a physical host interface."), }; static const vshCmdOptDef opts_interface_edit[] = { @@ -314,14 +309,9 @@ virshInterfaceListCollect(vshControl *ctl, /* * "iface-list" command */ -static const vshCmdInfo info_interface_list[] = { - {.name = "help", - .data = N_("list physical host interfaces") - }, - {.name = "desc", - .data = N_("Returns list of physical host interfaces.") - }, - {.name = NULL} +static const vshCmdInfo info_interface_list = { + .help = N_("list physical host interfaces"), + .desc = N_("Returns list of physical host interfaces."), }; static const vshCmdOptDef opts_interface_list[] = { @@ -385,14 +375,9 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "iface-name" command */ -static const vshCmdInfo info_interface_name[] = { - {.name = "help", - .data = N_("convert an interface MAC address to interface name") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_interface_name = { + .help = N_("convert an interface MAC address to interface name"), + .desc = "", }; static const vshCmdOptDef opts_interface_name[] = { @@ -421,14 +406,9 @@ cmdInterfaceName(vshControl *ctl, const vshCmd *cmd) /* * "iface-mac" command */ -static const vshCmdInfo info_interface_mac[] = { - {.name = "help", - .data = N_("convert an interface name to interface MAC address") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_interface_mac = { + .help = N_("convert an interface name to interface MAC address"), + .desc = "", }; static const vshCmdOptDef opts_interface_mac[] = { @@ -457,14 +437,9 @@ cmdInterfaceMAC(vshControl *ctl, const vshCmd *cmd) /* * "iface-dumpxml" command */ -static const vshCmdInfo info_interface_dumpxml[] = { - {.name = "help", - .data = N_("interface information in XML") - }, - {.name = "desc", - .data = N_("Output the physical host interface information as an XML dump to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_interface_dumpxml = { + .help = N_("interface information in XML"), + .desc = N_("Output the physical host interface information as an XML dump to stdout."), }; static const vshCmdOptDef opts_interface_dumpxml[] = { @@ -514,15 +489,10 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) /* * "iface-define" command */ -static const vshCmdInfo info_interface_define[] = { - {.name = "help", - .data = N_("define an inactive persistent physical host interface or " - "modify an existing persistent one from an XML file") - }, - {.name = "desc", - .data = N_("Define or modify a persistent physical host interface.") - }, - {.name = NULL} +static const vshCmdInfo info_interface_define = { + .help = N_("define an inactive persistent physical host interface or " + "modify an existing persistent one from an XML file"), + .desc = N_("Define or modify a persistent physical host interface."), }; static const vshCmdOptDef opts_interface_define[] = { @@ -565,14 +535,9 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) /* * "iface-undefine" command */ -static const vshCmdInfo info_interface_undefine[] = { - {.name = "help", - .data = N_("undefine a physical host interface (remove it from configuration)") - }, - {.name = "desc", - .data = N_("undefine an interface.") - }, - {.name = NULL} +static const vshCmdInfo info_interface_undefine = { + .help = N_("undefine a physical host interface (remove it from configuration)"), + .desc = N_("undefine an interface."), }; static const vshCmdOptDef opts_interface_undefine[] = { @@ -601,14 +566,9 @@ cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd) /* * "iface-start" command */ -static const vshCmdInfo info_interface_start[] = { - {.name = "help", - .data = N_("start a physical host interface (enable it / \"if-up\")") - }, - {.name = "desc", - .data = N_("start a physical host interface.") - }, - {.name = NULL} +static const vshCmdInfo info_interface_start = { + .help = N_("start a physical host interface (enable it / \"if-up\")"), + .desc = N_("start a physical host interface."), }; static const vshCmdOptDef opts_interface_start[] = { @@ -637,14 +597,9 @@ cmdInterfaceStart(vshControl *ctl, const vshCmd *cmd) /* * "iface-destroy" command */ -static const vshCmdInfo info_interface_destroy[] = { - {.name = "help", - .data = N_("destroy a physical host interface (disable it / \"if-down\")") - }, - {.name = "desc", - .data = N_("forcefully stop a physical host interface.") - }, - {.name = NULL} +static const vshCmdInfo info_interface_destroy = { + .help = N_("destroy a physical host interface (disable it / \"if-down\")"), + .desc = N_("forcefully stop a physical host interface."), }; static const vshCmdOptDef opts_interface_destroy[] = { @@ -673,16 +628,11 @@ cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd) /* * "iface-begin" command */ -static const vshCmdInfo info_interface_begin[] = { - {.name = "help", - .data = N_("create a snapshot of current interfaces settings, " +static const vshCmdInfo info_interface_begin = { + .help = N_("create a snapshot of current interfaces settings, " "which can be later committed (iface-commit) or " - "restored (iface-rollback)") - }, - {.name = "desc", - .data = N_("Create a restore point for interfaces settings") - }, - {.name = NULL} + "restored (iface-rollback)"), + .desc = N_("Create a restore point for interfaces settings"), }; static const vshCmdOptDef opts_interface_begin[] = { @@ -706,14 +656,9 @@ cmdInterfaceBegin(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "iface-commit" command */ -static const vshCmdInfo info_interface_commit[] = { - {.name = "help", - .data = N_("commit changes made since iface-begin and free restore point") - }, - {.name = "desc", - .data = N_("commit changes and free restore point") - }, - {.name = NULL} +static const vshCmdInfo info_interface_commit = { + .help = N_("commit changes made since iface-begin and free restore point"), + .desc = N_("commit changes and free restore point"), }; static const vshCmdOptDef opts_interface_commit[] = { @@ -737,14 +682,9 @@ cmdInterfaceCommit(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "iface-rollback" command */ -static const vshCmdInfo info_interface_rollback[] = { - {.name = "help", - .data = N_("rollback to previous saved configuration created via iface-begin") - }, - {.name = "desc", - .data = N_("rollback to previous restore point") - }, - {.name = NULL} +static const vshCmdInfo info_interface_rollback = { + .help = N_("rollback to previous saved configuration created via iface-begin"), + .desc = N_("rollback to previous restore point"), }; static const vshCmdOptDef opts_interface_rollback[] = { @@ -768,14 +708,9 @@ cmdInterfaceRollback(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "iface-bridge" command */ -static const vshCmdInfo info_interface_bridge[] = { - {.name = "help", - .data = N_("create a bridge device and attach an existing network device to it") - }, - {.name = "desc", - .data = N_("bridge an existing network device") - }, - {.name = NULL} +static const vshCmdInfo info_interface_bridge = { + .help = N_("create a bridge device and attach an existing network device to it"), + .desc = N_("bridge an existing network device"), }; static const vshCmdOptDef opts_interface_bridge[] = { @@ -1000,14 +935,9 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) /* * "iface-unbridge" command */ -static const vshCmdInfo info_interface_unbridge[] = { - {.name = "help", - .data = N_("undefine a bridge device after detaching its device(s)") - }, - {.name = "desc", - .data = N_("unbridge a network device") - }, - {.name = NULL} +static const vshCmdInfo info_interface_unbridge = { + .help = N_("undefine a bridge device after detaching its device(s)"), + .desc = N_("unbridge a network device"), }; static const vshCmdOptDef opts_interface_unbridge[] = { @@ -1196,85 +1126,85 @@ const vshCmdDef ifaceCmds[] = { {.name = "iface-begin", .handler = cmdInterfaceBegin, .opts = opts_interface_begin, - .info = info_interface_begin, + .info = &info_interface_begin, .flags = 0 }, {.name = "iface-bridge", .handler = cmdInterfaceBridge, .opts = opts_interface_bridge, - .info = info_interface_bridge, + .info = &info_interface_bridge, .flags = 0 }, {.name = "iface-commit", .handler = cmdInterfaceCommit, .opts = opts_interface_commit, - .info = info_interface_commit, + .info = &info_interface_commit, .flags = 0 }, {.name = "iface-define", .handler = cmdInterfaceDefine, .opts = opts_interface_define, - .info = info_interface_define, + .info = &info_interface_define, .flags = 0 }, {.name = "iface-destroy", .handler = cmdInterfaceDestroy, .opts = opts_interface_destroy, - .info = info_interface_destroy, + .info = &info_interface_destroy, .flags = 0 }, {.name = "iface-dumpxml", .handler = cmdInterfaceDumpXML, .opts = opts_interface_dumpxml, - .info = info_interface_dumpxml, + .info = &info_interface_dumpxml, .flags = 0 }, {.name = "iface-edit", .handler = cmdInterfaceEdit, .opts = opts_interface_edit, - .info = info_interface_edit, + .info = &info_interface_edit, .flags = 0 }, {.name = "iface-list", .handler = cmdInterfaceList, .opts = opts_interface_list, - .info = info_interface_list, + .info = &info_interface_list, .flags = 0 }, {.name = "iface-mac", .handler = cmdInterfaceMAC, .opts = opts_interface_mac, - .info = info_interface_mac, + .info = &info_interface_mac, .flags = 0 }, {.name = "iface-name", .handler = cmdInterfaceName, .opts = opts_interface_name, - .info = info_interface_name, + .info = &info_interface_name, .flags = 0 }, {.name = "iface-rollback", .handler = cmdInterfaceRollback, .opts = opts_interface_rollback, - .info = info_interface_rollback, + .info = &info_interface_rollback, .flags = 0 }, {.name = "iface-start", .handler = cmdInterfaceStart, .opts = opts_interface_start, - .info = info_interface_start, + .info = &info_interface_start, .flags = 0 }, {.name = "iface-unbridge", .handler = cmdInterfaceUnbridge, .opts = opts_interface_unbridge, - .info = info_interface_unbridge, + .info = &info_interface_unbridge, .flags = 0 }, {.name = "iface-undefine", .handler = cmdInterfaceUndefine, .opts = opts_interface_undefine, - .info = info_interface_undefine, + .info = &info_interface_undefine, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 68c7543863..6f4a66b659 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -134,14 +134,9 @@ virshCommandOptNetworkPort(vshControl *ctl, const vshCmd *cmd, /* * "net-autostart" command */ -static const vshCmdInfo info_network_autostart[] = { - {.name = "help", - .data = N_("autostart a network") - }, - {.name = "desc", - .data = N_("Configure a network to be automatically started at boot.") - }, - {.name = NULL} +static const vshCmdInfo info_network_autostart = { + .help = N_("autostart a network"), + .desc = N_("Configure a network to be automatically started at boot."), }; static const vshCmdOptDef opts_network_autostart[] = { @@ -184,14 +179,9 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) /* * "net-create" command */ -static const vshCmdInfo info_network_create[] = { - {.name = "help", - .data = N_("create a network from an XML file") - }, - {.name = "desc", - .data = N_("Create a network.") - }, - {.name = NULL} +static const vshCmdInfo info_network_create = { + .help = N_("create a network from an XML file"), + .desc = N_("Create a network."), }; static const vshCmdOptDef opts_network_create[] = { @@ -239,15 +229,10 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) /* * "net-define" command */ -static const vshCmdInfo info_network_define[] = { - {.name = "help", - .data = N_("define an inactive persistent virtual network or modify " - "an existing persistent one from an XML file") - }, - {.name = "desc", - .data = N_("Define or modify a persistent virtual network.") - }, - {.name = NULL} +static const vshCmdInfo info_network_define = { + .help = N_("define an inactive persistent virtual network or modify " + "an existing persistent one from an XML file"), + .desc = N_("Define or modify a persistent virtual network."), }; static const vshCmdOptDef opts_network_define[] = { @@ -295,14 +280,9 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) /* * "net-destroy" command */ -static const vshCmdInfo info_network_destroy[] = { - {.name = "help", - .data = N_("destroy (stop) a network") - }, - {.name = "desc", - .data = N_("Forcefully stop a given network.") - }, - {.name = NULL} +static const vshCmdInfo info_network_destroy = { + .help = N_("destroy (stop) a network"), + .desc = N_("Forcefully stop a given network."), }; static const vshCmdOptDef opts_network_destroy[] = { @@ -333,14 +313,9 @@ cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd) /* * "net-desc" command */ -static const vshCmdInfo info_network_desc[] = { - {.name = "help", - .data = N_("show or set network's description or title") - }, - {.name = "desc", - .data = N_("Allows setting or modifying the description or title of a network.") - }, - {.name = NULL} +static const vshCmdInfo info_network_desc = { + .help = N_("show or set network's description or title"), + .desc = N_("Allows setting or modifying the description or title of a network."), }; static const vshCmdOptDef opts_network_desc[] = { @@ -536,14 +511,9 @@ cmdNetworkDesc(vshControl *ctl, const vshCmd *cmd) /* * "net-metadata" command */ -static const vshCmdInfo info_network_metadata[] = { - {.name = "help", - .data = N_("show or set network's custom XML metadata") - }, - {.name = "desc", - .data = N_("Shows or modifies the XML metadata of a network.") - }, - {.name = NULL} +static const vshCmdInfo info_network_metadata = { + .help = N_("show or set network's custom XML metadata"), + .desc = N_("Shows or modifies the XML metadata of a network."), }; static const vshCmdOptDef opts_network_metadata[] = { @@ -679,14 +649,9 @@ cmdNetworkMetadata(vshControl *ctl, const vshCmd *cmd) /* * "net-dumpxml" command */ -static const vshCmdInfo info_network_dumpxml[] = { - {.name = "help", - .data = N_("network information in XML") - }, - {.name = "desc", - .data = N_("Output the network information as an XML dump to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_network_dumpxml = { + .help = N_("network information in XML"), + .desc = N_("Output the network information as an XML dump to stdout."), }; static const vshCmdOptDef opts_network_dumpxml[] = { @@ -735,14 +700,9 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) /* * "net-info" command */ -static const vshCmdInfo info_network_info[] = { - {.name = "help", - .data = N_("network information") - }, - {.name = "desc", - .data = N_("Returns basic information about the network") - }, - {.name = NULL} +static const vshCmdInfo info_network_info = { + .help = N_("network information"), + .desc = N_("Returns basic information about the network"), }; static const vshCmdOptDef opts_network_info[] = { @@ -1010,14 +970,9 @@ virshNetworkListCollect(vshControl *ctl, /* * "net-list" command */ -static const vshCmdInfo info_network_list[] = { - {.name = "help", - .data = N_("list networks") - }, - {.name = "desc", - .data = N_("Returns list of networks.") - }, - {.name = NULL} +static const vshCmdInfo info_network_list = { + .help = N_("list networks"), + .desc = N_("Returns list of networks."), }; static const vshCmdOptDef opts_network_list[] = { @@ -1182,14 +1137,9 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "net-name" command */ -static const vshCmdInfo info_network_name[] = { - {.name = "help", - .data = N_("convert a network UUID to network name") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_network_name = { + .help = N_("convert a network UUID to network name"), + .desc = "", }; static const vshCmdOptDef opts_network_name[] = { @@ -1218,14 +1168,9 @@ cmdNetworkName(vshControl *ctl, const vshCmd *cmd) /* * "net-start" command */ -static const vshCmdInfo info_network_start[] = { - {.name = "help", - .data = N_("start a (previously defined) inactive network") - }, - {.name = "desc", - .data = N_("Start a network.") - }, - {.name = NULL} +static const vshCmdInfo info_network_start = { + .help = N_("start a (previously defined) inactive network"), + .desc = N_("Start a network."), }; static const vshCmdOptDef opts_network_start[] = { @@ -1255,14 +1200,9 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd) /* * "net-undefine" command */ -static const vshCmdInfo info_network_undefine[] = { - {.name = "help", - .data = N_("undefine a persistent network") - }, - {.name = "desc", - .data = N_("Undefine the configuration for a persistent network.") - }, - {.name = NULL} +static const vshCmdInfo info_network_undefine = { + .help = N_("undefine a persistent network"), + .desc = N_("Undefine the configuration for a persistent network."), }; static const vshCmdOptDef opts_network_undefine[] = { @@ -1293,14 +1233,9 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) /* * "net-update" command */ -static const vshCmdInfo info_network_update[] = { - {.name = "help", - .data = N_("update parts of an existing network's configuration") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_network_update = { + .help = N_("update parts of an existing network's configuration"), + .desc = "", }; static const vshCmdOptDef opts_network_update[] = { @@ -1453,14 +1388,9 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) /* * "net-uuid" command */ -static const vshCmdInfo info_network_uuid[] = { - {.name = "help", - .data = N_("convert a network name to network UUID") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_network_uuid = { + .help = N_("convert a network name to network UUID"), + .desc = "", }; static const vshCmdOptDef opts_network_uuid[] = { @@ -1489,14 +1419,9 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) /* * "net-edit" command */ -static const vshCmdInfo info_network_edit[] = { - {.name = "help", - .data = N_("edit XML configuration for a network") - }, - {.name = "desc", - .data = N_("Edit the XML configuration for a network.") - }, - {.name = NULL} +static const vshCmdInfo info_network_edit = { + .help = N_("edit XML configuration for a network"), + .desc = N_("Edit the XML configuration for a network."), }; static const vshCmdOptDef opts_network_edit[] = { @@ -1667,14 +1592,9 @@ virshNetworkEventCallback virshNetworkEventCallbacks[] = { }; G_STATIC_ASSERT(VIR_NETWORK_EVENT_ID_LAST == G_N_ELEMENTS(virshNetworkEventCallbacks)); -static const vshCmdInfo info_network_event[] = { - {.name = "help", - .data = N_("Network Events") - }, - {.name = "desc", - .data = N_("List event types, or wait for network events to occur") - }, - {.name = NULL} +static const vshCmdInfo info_network_event = { + .help = N_("Network Events"), + .desc = N_("List event types, or wait for network events to occur"), }; static const vshCmdOptDef opts_network_event[] = { @@ -1782,14 +1702,9 @@ cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd) /* * "net-dhcp-leases" command */ -static const vshCmdInfo info_network_dhcp_leases[] = { - {.name = "help", - .data = N_("print lease info for a given network") - }, - {.name = "desc", - .data = N_("Print lease info for a given network") - }, - {.name = NULL} +static const vshCmdInfo info_network_dhcp_leases = { + .help = N_("print lease info for a given network"), + .desc = N_("Print lease info for a given network"), }; static const vshCmdOptDef opts_network_dhcp_leases[] = { @@ -1897,14 +1812,9 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) /* * "net-port-create" command */ -static const vshCmdInfo info_network_port_create[] = { - {.name = "help", - .data = N_("create a network port from an XML file") - }, - {.name = "desc", - .data = N_("Create a network port.") - }, - {.name = NULL} +static const vshCmdInfo info_network_port_create = { + .help = N_("create a network port from an XML file"), + .desc = N_("Create a network port."), }; static const vshCmdOptDef opts_network_port_create[] = { @@ -1964,14 +1874,9 @@ cmdNetworkPortCreate(vshControl *ctl, const vshCmd *cmd) /* * "net-port-dumpxml" command */ -static const vshCmdInfo info_network_port_dumpxml[] = { - {.name = "help", - .data = N_("network port information in XML") - }, - {.name = "desc", - .data = N_("Output the network port information as an XML dump to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_network_port_dumpxml = { + .help = N_("network port information in XML"), + .desc = N_("Output the network port information as an XML dump to stdout."), }; static const vshCmdOptDef opts_network_port_dumpxml[] = { @@ -2025,14 +1930,9 @@ cmdNetworkPortDumpXML(vshControl *ctl, const vshCmd *cmd) /* * "net-port-delete" command */ -static const vshCmdInfo info_network_port_delete[] = { - {.name = "help", - .data = N_("delete the specified network port") - }, - {.name = "desc", - .data = N_("Delete the specified network port.") - }, - {.name = NULL} +static const vshCmdInfo info_network_port_delete = { + .help = N_("delete the specified network port"), + .desc = N_("Delete the specified network port."), }; static const vshCmdOptDef opts_network_port_delete[] = { @@ -2155,14 +2055,9 @@ virshNetworkPortListCollect(vshControl *ctl, /* * "net-list" command */ -static const vshCmdInfo info_network_port_list[] = { - {.name = "help", - .data = N_("list network ports") - }, - {.name = "desc", - .data = N_("Returns list of network ports.") - }, - {.name = NULL} +static const vshCmdInfo info_network_port_list = { + .help = N_("list network ports"), + .desc = N_("Returns list of network ports."), }; static const vshCmdOptDef opts_network_port_list[] = { @@ -2237,127 +2132,127 @@ const vshCmdDef networkCmds[] = { {.name = "net-autostart", .handler = cmdNetworkAutostart, .opts = opts_network_autostart, - .info = info_network_autostart, + .info = &info_network_autostart, .flags = 0 }, {.name = "net-create", .handler = cmdNetworkCreate, .opts = opts_network_create, - .info = info_network_create, + .info = &info_network_create, .flags = 0 }, {.name = "net-define", .handler = cmdNetworkDefine, .opts = opts_network_define, - .info = info_network_define, + .info = &info_network_define, .flags = 0 }, {.name = "net-desc", .handler = cmdNetworkDesc, .opts = opts_network_desc, - .info = info_network_desc, + .info = &info_network_desc, .flags = 0 }, {.name = "net-destroy", .handler = cmdNetworkDestroy, .opts = opts_network_destroy, - .info = info_network_destroy, + .info = &info_network_destroy, .flags = 0 }, {.name = "net-dhcp-leases", .handler = cmdNetworkDHCPLeases, .opts = opts_network_dhcp_leases, - .info = info_network_dhcp_leases, + .info = &info_network_dhcp_leases, .flags = 0, }, {.name = "net-dumpxml", .handler = cmdNetworkDumpXML, .opts = opts_network_dumpxml, - .info = info_network_dumpxml, + .info = &info_network_dumpxml, .flags = 0 }, {.name = "net-edit", .handler = cmdNetworkEdit, .opts = opts_network_edit, - .info = info_network_edit, + .info = &info_network_edit, .flags = 0 }, {.name = "net-event", .handler = cmdNetworkEvent, .opts = opts_network_event, - .info = info_network_event, + .info = &info_network_event, .flags = 0 }, {.name = "net-info", .handler = cmdNetworkInfo, .opts = opts_network_info, - .info = info_network_info, + .info = &info_network_info, .flags = 0 }, {.name = "net-list", .handler = cmdNetworkList, .opts = opts_network_list, - .info = info_network_list, + .info = &info_network_list, .flags = 0 }, {.name = "net-metadata", .handler = cmdNetworkMetadata, .opts = opts_network_metadata, - .info = info_network_metadata, + .info = &info_network_metadata, .flags = 0 }, {.name = "net-name", .handler = cmdNetworkName, .opts = opts_network_name, - .info = info_network_name, + .info = &info_network_name, .flags = 0 }, {.name = "net-start", .handler = cmdNetworkStart, .opts = opts_network_start, - .info = info_network_start, + .info = &info_network_start, .flags = 0 }, {.name = "net-undefine", .handler = cmdNetworkUndefine, .opts = opts_network_undefine, - .info = info_network_undefine, + .info = &info_network_undefine, .flags = 0 }, {.name = "net-update", .handler = cmdNetworkUpdate, .opts = opts_network_update, - .info = info_network_update, + .info = &info_network_update, .flags = 0 }, {.name = "net-uuid", .handler = cmdNetworkUuid, .opts = opts_network_uuid, - .info = info_network_uuid, + .info = &info_network_uuid, .flags = 0 }, {.name = "net-port-list", .handler = cmdNetworkPortList, .opts = opts_network_port_list, - .info = info_network_port_list, + .info = &info_network_port_list, .flags = 0 }, {.name = "net-port-create", .handler = cmdNetworkPortCreate, .opts = opts_network_port_create, - .info = info_network_port_create, + .info = &info_network_port_create, .flags = 0 }, {.name = "net-port-dumpxml", .handler = cmdNetworkPortDumpXML, .opts = opts_network_port_dumpxml, - .info = info_network_port_dumpxml, + .info = &info_network_port_dumpxml, .flags = 0 }, {.name = "net-port-delete", .handler = cmdNetworkPortDelete, .opts = opts_network_port_delete, - .info = info_network_port_delete, + .info = &info_network_port_delete, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index b5a88b194f..c0fb319fa7 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -34,17 +34,12 @@ /* * "nodedev-create" command */ -static const vshCmdInfo info_node_device_create[] = { - {.name = "help", - .data = N_("create a device defined " - "by an XML file on the node") - }, - {.name = "desc", - .data = N_("Create a device on the node. Note that this " +static const vshCmdInfo info_node_device_create = { + .help = N_("create a device defined " + "by an XML file on the node"), + .desc = N_("Create a device on the node. Note that this " "command creates devices on the physical host " - "that can then be assigned to a virtual machine.") - }, - {.name = NULL} + "that can then be assigned to a virtual machine."), }; static const vshCmdOptDef opts_node_device_create[] = { @@ -89,15 +84,10 @@ cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd) /* * "nodedev-destroy" command */ -static const vshCmdInfo info_node_device_destroy[] = { - {.name = "help", - .data = N_("destroy (stop) a device on the node") - }, - {.name = "desc", - .data = N_("Destroy a device on the node. Note that this " - "command destroys devices on the physical host") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_destroy = { + .help = N_("destroy (stop) a device on the node"), + .desc = N_("Destroy a device on the node. Note that this " + "command destroys devices on the physical host"), }; static const vshCmdOptDef opts_node_device_destroy[] = { @@ -362,14 +352,9 @@ virshNodeDeviceListCollect(vshControl *ctl, /* * "nodedev-list" command */ -static const vshCmdInfo info_node_list_devices[] = { - {.name = "help", - .data = N_("enumerate devices on this host") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_node_list_devices = { + .help = N_("enumerate devices on this host"), + .desc = "", }; static const vshCmdOptDef opts_node_list_devices[] = { @@ -577,14 +562,9 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "nodedev-dumpxml" command */ -static const vshCmdInfo info_node_device_dumpxml[] = { - {.name = "help", - .data = N_("node device details in XML") - }, - {.name = "desc", - .data = N_("Output the node device details as an XML dump to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_dumpxml = { + .help = N_("node device details in XML"), + .desc = N_("Output the node device details as an XML dump to stdout."), }; @@ -645,14 +625,9 @@ cmdNodeDeviceDumpXML(vshControl *ctl, const vshCmd *cmd) /* * "nodedev-detach" command */ -static const vshCmdInfo info_node_device_detach[] = { - {.name = "help", - .data = N_("detach node device from its device driver") - }, - {.name = "desc", - .data = N_("Detach node device from its device driver before assigning to a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_detach = { + .help = N_("detach node device from its device driver"), + .desc = N_("Detach node device from its device driver before assigning to a domain."), }; @@ -712,14 +687,9 @@ cmdNodeDeviceDetach(vshControl *ctl, const vshCmd *cmd) /* * "nodedev-reattach" command */ -static const vshCmdInfo info_node_device_reattach[] = { - {.name = "help", - .data = N_("reattach node device to its device driver") - }, - {.name = "desc", - .data = N_("Reattach node device to its device driver once released by the domain.") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_reattach = { + .help = N_("reattach node device to its device driver"), + .desc = N_("Reattach node device to its device driver once released by the domain."), }; @@ -762,14 +732,9 @@ cmdNodeDeviceReAttach(vshControl *ctl, const vshCmd *cmd) /* * "nodedev-reset" command */ -static const vshCmdInfo info_node_device_reset[] = { - {.name = "help", - .data = N_("reset node device") - }, - {.name = "desc", - .data = N_("Reset node device before or after assigning to a domain.") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_reset = { + .help = N_("reset node device"), + .desc = N_("Reset node device before or after assigning to a domain."), }; @@ -906,14 +871,9 @@ virshNodeDeviceEventCallback virshNodeDeviceEventCallbacks[] = { G_STATIC_ASSERT(VIR_NODE_DEVICE_EVENT_ID_LAST == G_N_ELEMENTS(virshNodeDeviceEventCallbacks)); -static const vshCmdInfo info_node_device_event[] = { - {.name = "help", - .data = N_("Node Device Events") - }, - {.name = "desc", - .data = N_("List event types, or wait for node device events to occur") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_event = { + .help = N_("Node Device Events"), + .desc = N_("List event types, or wait for node device events to occur"), }; static const vshCmdOptDef opts_node_device_event[] = { @@ -1034,14 +994,9 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) /* * "nodedev-undefine" command */ -static const vshCmdInfo info_node_device_undefine[] = { - {.name = "help", - .data = N_("Undefine an inactive node device") - }, - {.name = "desc", - .data = N_("Undefines the configuration for an inactive node device") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_undefine = { + .help = N_("Undefine an inactive node device"), + .desc = N_("Undefines the configuration for an inactive node device"), }; static const vshCmdOptDef opts_node_device_undefine[] = { @@ -1081,16 +1036,11 @@ cmdNodeDeviceUndefine(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "nodedev-define" command */ -static const vshCmdInfo info_node_device_define[] = { - {.name = "help", - .data = N_("Define or modify a device by an xml file on a node") - }, - {.name = "desc", - .data = N_("Defines or modifies a persistent device on the node that " +static const vshCmdInfo info_node_device_define = { + .help = N_("Define or modify a device by an xml file on a node"), + .desc = N_("Defines or modifies a persistent device on the node that " "can be assigned to a domain. The device must be started " - "before it can be assigned to a domain.") - }, - {.name = NULL} + "before it can be assigned to a domain."), }; static const vshCmdOptDef opts_node_device_define[] = { @@ -1135,14 +1085,9 @@ cmdNodeDeviceDefine(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "nodedev-start" command */ -static const vshCmdInfo info_node_device_start[] = { - {.name = "help", - .data = N_("Start an inactive node device") - }, - {.name = "desc", - .data = N_("Starts an inactive node device that was previously defined") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_start = { + .help = N_("Start an inactive node device"), + .desc = N_("Starts an inactive node device that was previously defined"), }; static const vshCmdOptDef opts_node_device_start[] = { @@ -1185,14 +1130,9 @@ cmdNodeDeviceStart(vshControl *ctl, const vshCmd *cmd) /* * "nodedev-autostart" command */ -static const vshCmdInfo info_node_device_autostart[] = { - {.name = "help", - .data = N_("autostart a defined node device") - }, - {.name = "desc", - .data = N_("Configure a node device to be automatically started at boot.") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_autostart = { + .help = N_("autostart a defined node device"), + .desc = N_("Configure a node device to be automatically started at boot."), }; static const vshCmdOptDef opts_node_device_autostart[] = { @@ -1246,14 +1186,9 @@ cmdNodeDeviceAutostart(vshControl *ctl, const vshCmd *cmd) /* * "nodedev-info" command */ -static const vshCmdInfo info_node_device_info[] = { - {.name = "help", - .data = N_("node device information") - }, - {.name = "desc", - .data = N_("Returns basic information about the node device") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_info = { + .help = N_("node device information"), + .desc = N_("Returns basic information about the node device"), }; @@ -1302,14 +1237,9 @@ cmdNodeDeviceInfo(vshControl *ctl, const vshCmd *cmd) /* * "nodedev-update" command */ -static const vshCmdInfo info_node_device_update[] = { - {.name = "help", - .data = N_("Update a active and/or inactive node device") - }, - {.name = "desc", - .data = N_("Updates the configuration of a node device") - }, - {.name = NULL} +static const vshCmdInfo info_node_device_update = { + .help = N_("Update a active and/or inactive node device"), + .desc = N_("Updates the configuration of a node device"), }; static const vshCmdOptDef opts_node_device_update[] = { @@ -1399,19 +1329,19 @@ const vshCmdDef nodedevCmds[] = { {.name = "nodedev-create", .handler = cmdNodeDeviceCreate, .opts = opts_node_device_create, - .info = info_node_device_create, + .info = &info_node_device_create, .flags = 0 }, {.name = "nodedev-destroy", .handler = cmdNodeDeviceDestroy, .opts = opts_node_device_destroy, - .info = info_node_device_destroy, + .info = &info_node_device_destroy, .flags = 0 }, {.name = "nodedev-detach", .handler = cmdNodeDeviceDetach, .opts = opts_node_device_detach, - .info = info_node_device_detach, + .info = &info_node_device_detach, .flags = 0 }, {.name = "nodedev-dettach", @@ -1420,67 +1350,67 @@ const vshCmdDef nodedevCmds[] = { {.name = "nodedev-dumpxml", .handler = cmdNodeDeviceDumpXML, .opts = opts_node_device_dumpxml, - .info = info_node_device_dumpxml, + .info = &info_node_device_dumpxml, .flags = 0 }, {.name = "nodedev-list", .handler = cmdNodeListDevices, .opts = opts_node_list_devices, - .info = info_node_list_devices, + .info = &info_node_list_devices, .flags = 0 }, {.name = "nodedev-reattach", .handler = cmdNodeDeviceReAttach, .opts = opts_node_device_reattach, - .info = info_node_device_reattach, + .info = &info_node_device_reattach, .flags = 0 }, {.name = "nodedev-reset", .handler = cmdNodeDeviceReset, .opts = opts_node_device_reset, - .info = info_node_device_reset, + .info = &info_node_device_reset, .flags = 0 }, {.name = "nodedev-event", .handler = cmdNodeDeviceEvent, .opts = opts_node_device_event, - .info = info_node_device_event, + .info = &info_node_device_event, .flags = 0 }, {.name = "nodedev-define", .handler = cmdNodeDeviceDefine, .opts = opts_node_device_define, - .info = info_node_device_define, + .info = &info_node_device_define, .flags = 0 }, {.name = "nodedev-undefine", .handler = cmdNodeDeviceUndefine, .opts = opts_node_device_undefine, - .info = info_node_device_undefine, + .info = &info_node_device_undefine, .flags = 0 }, {.name = "nodedev-start", .handler = cmdNodeDeviceStart, .opts = opts_node_device_start, - .info = info_node_device_start, + .info = &info_node_device_start, .flags = 0 }, {.name = "nodedev-autostart", .handler = cmdNodeDeviceAutostart, .opts = opts_node_device_autostart, - .info = info_node_device_autostart, + .info = &info_node_device_autostart, .flags = 0 }, {.name = "nodedev-info", .handler = cmdNodeDeviceInfo, .opts = opts_node_device_info, - .info = info_node_device_info, + .info = &info_node_device_info, .flags = 0 }, {.name = "nodedev-update", .handler = cmdNodeDeviceUpdate, .opts = opts_node_device_update, - .info = info_node_device_update, + .info = &info_node_device_update, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index fa52d020e4..7a578f3f7c 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -69,14 +69,9 @@ virshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd, /* * "nwfilter-define" command */ -static const vshCmdInfo info_nwfilter_define[] = { - {.name = "help", - .data = N_("define or update a network filter from an XML file") - }, - {.name = "desc", - .data = N_("Define a new network filter or update an existing one.") - }, - {.name = NULL} +static const vshCmdInfo info_nwfilter_define = { + .help = N_("define or update a network filter from an XML file"), + .desc = N_("Define a new network filter or update an existing one."), }; static const vshCmdOptDef opts_nwfilter_define[] = { @@ -126,14 +121,9 @@ cmdNWFilterDefine(vshControl *ctl, const vshCmd *cmd) /* * "nwfilter-undefine" command */ -static const vshCmdInfo info_nwfilter_undefine[] = { - {.name = "help", - .data = N_("undefine a network filter") - }, - {.name = "desc", - .data = N_("Undefine a given network filter.") - }, - {.name = NULL} +static const vshCmdInfo info_nwfilter_undefine = { + .help = N_("undefine a network filter"), + .desc = N_("Undefine a given network filter."), }; static const vshCmdOptDef opts_nwfilter_undefine[] = { @@ -169,14 +159,9 @@ cmdNWFilterUndefine(vshControl *ctl, const vshCmd *cmd) /* * "nwfilter-dumpxml" command */ -static const vshCmdInfo info_nwfilter_dumpxml[] = { - {.name = "help", - .data = N_("network filter information in XML") - }, - {.name = "desc", - .data = N_("Output the network filter information as an XML dump to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_nwfilter_dumpxml = { + .help = N_("network filter information in XML"), + .desc = N_("Output the network filter information as an XML dump to stdout."), }; static const vshCmdOptDef opts_nwfilter_dumpxml[] = { @@ -351,14 +336,9 @@ virshNWFilterListCollect(vshControl *ctl, /* * "nwfilter-list" command */ -static const vshCmdInfo info_nwfilter_list[] = { - {.name = "help", - .data = N_("list network filters") - }, - {.name = "desc", - .data = N_("Returns list of network filters.") - }, - {.name = NULL} +static const vshCmdInfo info_nwfilter_list = { + .help = N_("list network filters"), + .desc = N_("Returns list of network filters."), }; static const vshCmdOptDef opts_nwfilter_list[] = { @@ -403,14 +383,9 @@ cmdNWFilterList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "nwfilter-edit" command */ -static const vshCmdInfo info_nwfilter_edit[] = { - {.name = "help", - .data = N_("edit XML configuration for a network filter") - }, - {.name = "desc", - .data = N_("Edit the XML configuration for a network filter.") - }, - {.name = NULL} +static const vshCmdInfo info_nwfilter_edit = { + .help = N_("edit XML configuration for a network filter"), + .desc = N_("Edit the XML configuration for a network filter."), }; static const vshCmdOptDef opts_nwfilter_edit[] = { @@ -493,14 +468,9 @@ virshCommandOptNWFilterBindingBy(vshControl *ctl, /* * "nwfilter-binding-create" command */ -static const vshCmdInfo info_nwfilter_binding_create[] = { - {.name = "help", - .data = N_("create a network filter binding from an XML file") - }, - {.name = "desc", - .data = N_("Create a new network filter binding.") - }, - {.name = NULL} +static const vshCmdInfo info_nwfilter_binding_create = { + .help = N_("create a network filter binding from an XML file"), + .desc = N_("Create a new network filter binding."), }; static const vshCmdOptDef opts_nwfilter_binding_create[] = { @@ -548,14 +518,9 @@ cmdNWFilterBindingCreate(vshControl *ctl, const vshCmd *cmd) /* * "nwfilter-binding-delete" command */ -static const vshCmdInfo info_nwfilter_binding_delete[] = { - {.name = "help", - .data = N_("delete a network filter binding") - }, - {.name = "desc", - .data = N_("Delete a given network filter binding.") - }, - {.name = NULL} +static const vshCmdInfo info_nwfilter_binding_delete = { + .help = N_("delete a network filter binding"), + .desc = N_("Delete a given network filter binding."), }; static const vshCmdOptDef opts_nwfilter_binding_delete[] = { @@ -593,14 +558,9 @@ cmdNWFilterBindingDelete(vshControl *ctl, const vshCmd *cmd) /* * "nwfilter-binding-dumpxml" command */ -static const vshCmdInfo info_nwfilter_binding_dumpxml[] = { - {.name = "help", - .data = N_("network filter information in XML") - }, - {.name = "desc", - .data = N_("Output the network filter information as an XML dump to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_nwfilter_binding_dumpxml = { + .help = N_("network filter information in XML"), + .desc = N_("Output the network filter information as an XML dump to stdout."), }; static const vshCmdOptDef opts_nwfilter_binding_dumpxml[] = { @@ -726,14 +686,9 @@ virshNWFilterBindingListCollect(vshControl *ctl, /* * "nwfilter-binding-list" command */ -static const vshCmdInfo info_nwfilter_binding_list[] = { - {.name = "help", - .data = N_("list network filter bindings") - }, - {.name = "desc", - .data = N_("Returns list of network filter bindings.") - }, - {.name = NULL} +static const vshCmdInfo info_nwfilter_binding_list = { + .help = N_("list network filter bindings"), + .desc = N_("Returns list of network filter bindings."), }; static const vshCmdOptDef opts_nwfilter_binding_list[] = { @@ -778,55 +733,55 @@ const vshCmdDef nwfilterCmds[] = { {.name = "nwfilter-define", .handler = cmdNWFilterDefine, .opts = opts_nwfilter_define, - .info = info_nwfilter_define, + .info = &info_nwfilter_define, .flags = 0 }, {.name = "nwfilter-dumpxml", .handler = cmdNWFilterDumpXML, .opts = opts_nwfilter_dumpxml, - .info = info_nwfilter_dumpxml, + .info = &info_nwfilter_dumpxml, .flags = 0 }, {.name = "nwfilter-edit", .handler = cmdNWFilterEdit, .opts = opts_nwfilter_edit, - .info = info_nwfilter_edit, + .info = &info_nwfilter_edit, .flags = 0 }, {.name = "nwfilter-list", .handler = cmdNWFilterList, .opts = opts_nwfilter_list, - .info = info_nwfilter_list, + .info = &info_nwfilter_list, .flags = 0 }, {.name = "nwfilter-undefine", .handler = cmdNWFilterUndefine, .opts = opts_nwfilter_undefine, - .info = info_nwfilter_undefine, + .info = &info_nwfilter_undefine, .flags = 0 }, {.name = "nwfilter-binding-create", .handler = cmdNWFilterBindingCreate, .opts = opts_nwfilter_binding_create, - .info = info_nwfilter_binding_create, + .info = &info_nwfilter_binding_create, .flags = 0 }, {.name = "nwfilter-binding-delete", .handler = cmdNWFilterBindingDelete, .opts = opts_nwfilter_binding_delete, - .info = info_nwfilter_binding_delete, + .info = &info_nwfilter_binding_delete, .flags = 0 }, {.name = "nwfilter-binding-dumpxml", .handler = cmdNWFilterBindingDumpXML, .opts = opts_nwfilter_binding_dumpxml, - .info = info_nwfilter_binding_dumpxml, + .info = &info_nwfilter_binding_dumpxml, .flags = 0 }, {.name = "nwfilter-binding-list", .handler = cmdNWFilterBindingList, .opts = opts_nwfilter_binding_list, - .info = info_nwfilter_binding_list, + .info = &info_nwfilter_binding_list, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 8a583a8e1b..a7b82de9be 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -196,14 +196,9 @@ virshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, /* * "pool-autostart" command */ -static const vshCmdInfo info_pool_autostart[] = { - {.name = "help", - .data = N_("autostart a pool") - }, - {.name = "desc", - .data = N_("Configure a pool to be automatically started at boot.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_autostart = { + .help = N_("autostart a pool"), + .desc = N_("Configure a pool to be automatically started at boot."), }; static const vshCmdOptDef opts_pool_autostart[] = { @@ -247,14 +242,9 @@ cmdPoolAutostart(vshControl *ctl, const vshCmd *cmd) /* * "pool-create" command */ -static const vshCmdInfo info_pool_create[] = { - {.name = "help", - .data = N_("create a pool from an XML file") - }, - {.name = "desc", - .data = N_("Create a pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_create = { + .help = N_("create a pool from an XML file"), + .desc = N_("Create a pool."), }; static const vshCmdOptDef opts_pool_create[] = { @@ -437,14 +427,9 @@ virshBuildPoolXML(vshControl *ctl, /* * "pool-create-as" command */ -static const vshCmdInfo info_pool_create_as[] = { - {.name = "help", - .data = N_("create a pool from a set of args") - }, - {.name = "desc", - .data = N_("Create a pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_create_as = { + .help = N_("create a pool from a set of args"), + .desc = N_("Create a pool."), }; static const vshCmdOptDef opts_pool_create_as[] = { @@ -503,15 +488,10 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) /* * "pool-define" command */ -static const vshCmdInfo info_pool_define[] = { - {.name = "help", - .data = N_("define an inactive persistent storage pool or modify " - "an existing persistent one from an XML file") - }, - {.name = "desc", - .data = N_("Define or modify a persistent storage pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_define = { + .help = N_("define an inactive persistent storage pool or modify " + "an existing persistent one from an XML file"), + .desc = N_("Define or modify a persistent storage pool."), }; static const vshCmdOptDef opts_pool_define[] = { @@ -554,14 +534,9 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) /* * "pool-define-as" command */ -static const vshCmdInfo info_pool_define_as[] = { - {.name = "help", - .data = N_("define a pool from a set of args") - }, - {.name = "desc", - .data = N_("Define a pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_define_as = { + .help = N_("define a pool from a set of args"), + .desc = N_("Define a pool."), }; static bool @@ -593,14 +568,9 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) /* * "pool-build" command */ -static const vshCmdInfo info_pool_build[] = { - {.name = "help", - .data = N_("build a pool") - }, - {.name = "desc", - .data = N_("Build a given pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_build = { + .help = N_("build a pool"), + .desc = N_("Build a given pool."), }; static const vshCmdOptDef opts_pool_build[] = { @@ -641,14 +611,9 @@ cmdPoolBuild(vshControl *ctl, const vshCmd *cmd) /* * "pool-destroy" command */ -static const vshCmdInfo info_pool_destroy[] = { - {.name = "help", - .data = N_("destroy (stop) a pool") - }, - {.name = "desc", - .data = N_("Forcefully stop a given pool. Raw data in the pool is untouched") - }, - {.name = NULL} +static const vshCmdInfo info_pool_destroy = { + .help = N_("destroy (stop) a pool"), + .desc = N_("Forcefully stop a given pool. Raw data in the pool is untouched"), }; static const vshCmdOptDef opts_pool_destroy[] = { @@ -680,14 +645,9 @@ cmdPoolDestroy(vshControl *ctl, const vshCmd *cmd) /* * "pool-delete" command */ -static const vshCmdInfo info_pool_delete[] = { - {.name = "help", - .data = N_("delete a pool") - }, - {.name = "desc", - .data = N_("Delete a given pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_delete = { + .help = N_("delete a pool"), + .desc = N_("Delete a given pool."), }; static const vshCmdOptDef opts_pool_delete[] = { @@ -719,14 +679,9 @@ cmdPoolDelete(vshControl *ctl, const vshCmd *cmd) /* * "pool-refresh" command */ -static const vshCmdInfo info_pool_refresh[] = { - {.name = "help", - .data = N_("refresh a pool") - }, - {.name = "desc", - .data = N_("Refresh a given pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_refresh = { + .help = N_("refresh a pool"), + .desc = N_("Refresh a given pool."), }; static const vshCmdOptDef opts_pool_refresh[] = { @@ -758,14 +713,9 @@ cmdPoolRefresh(vshControl *ctl, const vshCmd *cmd) /* * "pool-dumpxml" command */ -static const vshCmdInfo info_pool_dumpxml[] = { - {.name = "help", - .data = N_("pool information in XML") - }, - {.name = "desc", - .data = N_("Output the pool information as an XML dump to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_dumpxml = { + .help = N_("pool information in XML"), + .desc = N_("Output the pool information as an XML dump to stdout."), }; static const vshCmdOptDef opts_pool_dumpxml[] = { @@ -1051,14 +1001,9 @@ virshStoragePoolStateToString(int state) /* * "pool-list" command */ -static const vshCmdInfo info_pool_list[] = { - {.name = "help", - .data = N_("list pools") - }, - {.name = "desc", - .data = N_("Returns list of pools.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_list = { + .help = N_("list pools"), + .desc = N_("Returns list of pools."), }; static const vshCmdOptDef opts_pool_list[] = { @@ -1401,14 +1346,9 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "find-storage-pool-sources-as" command */ -static const vshCmdInfo info_find_storage_pool_sources_as[] = { - {.name = "help", - .data = N_("find potential storage pool sources") - }, - {.name = "desc", - .data = N_("Returns XML <sources> document.") - }, - {.name = NULL} +static const vshCmdInfo info_find_storage_pool_sources_as = { + .help = N_("find potential storage pool sources"), + .desc = N_("Returns XML <sources> document."), }; static const vshCmdOptDef opts_find_storage_pool_sources_as[] = { @@ -1489,14 +1429,9 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd G_GNUC_UNUSED) /* * "find-storage-pool-sources" command */ -static const vshCmdInfo info_find_storage_pool_sources[] = { - {.name = "help", - .data = N_("discover potential storage pool sources") - }, - {.name = "desc", - .data = N_("Returns XML <sources> document.") - }, - {.name = NULL} +static const vshCmdInfo info_find_storage_pool_sources = { + .help = N_("discover potential storage pool sources"), + .desc = N_("Returns XML <sources> document."), }; static const vshCmdOptDef opts_find_storage_pool_sources[] = { @@ -1546,14 +1481,9 @@ cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd G_GNUC_UNUSED) /* * "pool-info" command */ -static const vshCmdInfo info_pool_info[] = { - {.name = "help", - .data = N_("storage pool information") - }, - {.name = "desc", - .data = N_("Returns basic information about the storage pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_info = { + .help = N_("storage pool information"), + .desc = N_("Returns basic information about the storage pool."), }; static const vshCmdOptDef opts_pool_info[] = { @@ -1636,14 +1566,9 @@ cmdPoolInfo(vshControl *ctl, const vshCmd *cmd) /* * "pool-name" command */ -static const vshCmdInfo info_pool_name[] = { - {.name = "help", - .data = N_("convert a pool UUID to pool name") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_pool_name = { + .help = N_("convert a pool UUID to pool name"), + .desc = "", }; static const vshCmdOptDef opts_pool_name[] = { @@ -1667,14 +1592,9 @@ cmdPoolName(vshControl *ctl, const vshCmd *cmd) /* * "pool-start" command */ -static const vshCmdInfo info_pool_start[] = { - {.name = "help", - .data = N_("start a (previously defined) inactive pool") - }, - {.name = "desc", - .data = N_("Start a pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_start = { + .help = N_("start a (previously defined) inactive pool"), + .desc = N_("Start a pool."), }; static const vshCmdOptDef opts_pool_start[] = { @@ -1727,14 +1647,9 @@ cmdPoolStart(vshControl *ctl, const vshCmd *cmd) /* * "pool-undefine" command */ -static const vshCmdInfo info_pool_undefine[] = { - {.name = "help", - .data = N_("undefine an inactive pool") - }, - {.name = "desc", - .data = N_("Undefine the configuration for an inactive pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_undefine = { + .help = N_("undefine an inactive pool"), + .desc = N_("Undefine the configuration for an inactive pool."), }; static const vshCmdOptDef opts_pool_undefine[] = { @@ -1766,14 +1681,9 @@ cmdPoolUndefine(vshControl *ctl, const vshCmd *cmd) /* * "pool-uuid" command */ -static const vshCmdInfo info_pool_uuid[] = { - {.name = "help", - .data = N_("convert a pool name to pool UUID") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_pool_uuid = { + .help = N_("convert a pool name to pool UUID"), + .desc = "", }; static const vshCmdOptDef opts_pool_uuid[] = { @@ -1802,14 +1712,9 @@ cmdPoolUuid(vshControl *ctl, const vshCmd *cmd) /* * "pool-edit" command */ -static const vshCmdInfo info_pool_edit[] = { - {.name = "help", - .data = N_("edit XML configuration for a storage pool") - }, - {.name = "desc", - .data = N_("Edit the XML configuration for a storage pool.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_edit = { + .help = N_("edit XML configuration for a storage pool"), + .desc = N_("Edit the XML configuration for a storage pool."), }; static const vshCmdOptDef opts_pool_edit[] = { @@ -1965,14 +1870,9 @@ virshPoolEventCallback virshPoolEventCallbacks[] = { G_STATIC_ASSERT(VIR_STORAGE_POOL_EVENT_ID_LAST == G_N_ELEMENTS(virshPoolEventCallbacks)); -static const vshCmdInfo info_pool_event[] = { - {.name = "help", - .data = N_("Storage Pool Events") - }, - {.name = "desc", - .data = N_("List event types, or wait for storage pool events to occur") - }, - {.name = NULL} +static const vshCmdInfo info_pool_event = { + .help = N_("Storage Pool Events"), + .desc = N_("List event types, or wait for storage pool events to occur"), }; static const vshCmdOptDef opts_pool_event[] = { @@ -2085,14 +1985,9 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) /* * "pool-capabilities" command */ -static const vshCmdInfo info_pool_capabilities[] = { - {.name = "help", - .data = N_("storage pool capabilities") - }, - {.name = "desc", - .data = N_("Returns capabilities of storage pool support.") - }, - {.name = NULL} +static const vshCmdInfo info_pool_capabilities = { + .help = N_("storage pool capabilities"), + .desc = N_("Returns capabilities of storage pool support."), }; static const vshCmdOptDef opts_pool_capabilities[] = { @@ -2122,127 +2017,127 @@ const vshCmdDef storagePoolCmds[] = { {.name = "find-storage-pool-sources-as", .handler = cmdPoolDiscoverSourcesAs, .opts = opts_find_storage_pool_sources_as, - .info = info_find_storage_pool_sources_as, + .info = &info_find_storage_pool_sources_as, .flags = 0 }, {.name = "find-storage-pool-sources", .handler = cmdPoolDiscoverSources, .opts = opts_find_storage_pool_sources, - .info = info_find_storage_pool_sources, + .info = &info_find_storage_pool_sources, .flags = 0 }, {.name = "pool-autostart", .handler = cmdPoolAutostart, .opts = opts_pool_autostart, - .info = info_pool_autostart, + .info = &info_pool_autostart, .flags = 0 }, {.name = "pool-build", .handler = cmdPoolBuild, .opts = opts_pool_build, - .info = info_pool_build, + .info = &info_pool_build, .flags = 0 }, {.name = "pool-create-as", .handler = cmdPoolCreateAs, .opts = opts_pool_create_as, - .info = info_pool_create_as, + .info = &info_pool_create_as, .flags = 0 }, {.name = "pool-create", .handler = cmdPoolCreate, .opts = opts_pool_create, - .info = info_pool_create, + .info = &info_pool_create, .flags = 0 }, {.name = "pool-define-as", .handler = cmdPoolDefineAs, .opts = opts_pool_define_as, - .info = info_pool_define_as, + .info = &info_pool_define_as, .flags = 0 }, {.name = "pool-define", .handler = cmdPoolDefine, .opts = opts_pool_define, - .info = info_pool_define, + .info = &info_pool_define, .flags = 0 }, {.name = "pool-delete", .handler = cmdPoolDelete, .opts = opts_pool_delete, - .info = info_pool_delete, + .info = &info_pool_delete, .flags = 0 }, {.name = "pool-destroy", .handler = cmdPoolDestroy, .opts = opts_pool_destroy, - .info = info_pool_destroy, + .info = &info_pool_destroy, .flags = 0 }, {.name = "pool-dumpxml", .handler = cmdPoolDumpXML, .opts = opts_pool_dumpxml, - .info = info_pool_dumpxml, + .info = &info_pool_dumpxml, .flags = 0 }, {.name = "pool-edit", .handler = cmdPoolEdit, .opts = opts_pool_edit, - .info = info_pool_edit, + .info = &info_pool_edit, .flags = 0 }, {.name = "pool-info", .handler = cmdPoolInfo, .opts = opts_pool_info, - .info = info_pool_info, + .info = &info_pool_info, .flags = 0 }, {.name = "pool-list", .handler = cmdPoolList, .opts = opts_pool_list, - .info = info_pool_list, + .info = &info_pool_list, .flags = 0 }, {.name = "pool-name", .handler = cmdPoolName, .opts = opts_pool_name, - .info = info_pool_name, + .info = &info_pool_name, .flags = 0 }, {.name = "pool-refresh", .handler = cmdPoolRefresh, .opts = opts_pool_refresh, - .info = info_pool_refresh, + .info = &info_pool_refresh, .flags = 0 }, {.name = "pool-start", .handler = cmdPoolStart, .opts = opts_pool_start, - .info = info_pool_start, + .info = &info_pool_start, .flags = 0 }, {.name = "pool-undefine", .handler = cmdPoolUndefine, .opts = opts_pool_undefine, - .info = info_pool_undefine, + .info = &info_pool_undefine, .flags = 0 }, {.name = "pool-uuid", .handler = cmdPoolUuid, .opts = opts_pool_uuid, - .info = info_pool_uuid, + .info = &info_pool_uuid, .flags = 0 }, {.name = "pool-event", .handler = cmdPoolEvent, .opts = opts_pool_event, - .info = info_pool_event, + .info = &info_pool_event, .flags = 0 }, {.name = "pool-capabilities", .handler = cmdPoolCapabilities, .opts = opts_pool_capabilities, - .info = info_pool_capabilities, + .info = &info_pool_capabilities, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index e54712ba78..a88980ef9e 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -61,14 +61,9 @@ virshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name) /* * "secret-define" command */ -static const vshCmdInfo info_secret_define[] = { - {.name = "help", - .data = N_("define or modify a secret from an XML file") - }, - {.name = "desc", - .data = N_("Define or modify a secret.") - }, - {.name = NULL} +static const vshCmdInfo info_secret_define = { + .help = N_("define or modify a secret from an XML file"), + .desc = N_("Define or modify a secret."), }; static const vshCmdOptDef opts_secret_define[] = { @@ -121,14 +116,9 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) /* * "secret-dumpxml" command */ -static const vshCmdInfo info_secret_dumpxml[] = { - {.name = "help", - .data = N_("secret attributes in XML") - }, - {.name = "desc", - .data = N_("Output attributes of a secret as an XML dump to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_secret_dumpxml = { + .help = N_("secret attributes in XML"), + .desc = N_("Output attributes of a secret as an XML dump to stdout."), }; static const vshCmdOptDef opts_secret_dumpxml[] = { @@ -181,14 +171,9 @@ cmdSecretDumpXML(vshControl *ctl, const vshCmd *cmd) /* * "secret-set-value" command */ -static const vshCmdInfo info_secret_set_value[] = { - {.name = "help", - .data = N_("set a secret value") - }, - {.name = "desc", - .data = N_("Set a secret value.") - }, - {.name = NULL} +static const vshCmdInfo info_secret_set_value = { + .help = N_("set a secret value"), + .desc = N_("Set a secret value."), }; static const vshCmdOptDef opts_secret_set_value[] = { @@ -297,14 +282,9 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) /* * "secret-get-value" command */ -static const vshCmdInfo info_secret_get_value[] = { - {.name = "help", - .data = N_("Output a secret value") - }, - {.name = "desc", - .data = N_("Output a secret value to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_secret_get_value = { + .help = N_("Output a secret value"), + .desc = N_("Output a secret value to stdout."), }; static const vshCmdOptDef opts_secret_get_value[] = { @@ -355,14 +335,9 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd) /* * "secret-undefine" command */ -static const vshCmdInfo info_secret_undefine[] = { - {.name = "help", - .data = N_("undefine a secret") - }, - {.name = "desc", - .data = N_("Undefine a secret.") - }, - {.name = NULL} +static const vshCmdInfo info_secret_undefine = { + .help = N_("undefine a secret"), + .desc = N_("Undefine a secret."), }; static const vshCmdOptDef opts_secret_undefine[] = { @@ -539,14 +514,9 @@ virshSecretListCollect(vshControl *ctl, /* * "secret-list" command */ -static const vshCmdInfo info_secret_list[] = { - {.name = "help", - .data = N_("list secrets") - }, - {.name = "desc", - .data = N_("Returns a list of secrets") - }, - {.name = NULL} +static const vshCmdInfo info_secret_list = { + .help = N_("list secrets"), + .desc = N_("Returns a list of secrets"), }; static const vshCmdOptDef opts_secret_list[] = { @@ -732,14 +702,9 @@ virshSecretEventCallback virshSecretEventCallbacks[] = { }; G_STATIC_ASSERT(VIR_SECRET_EVENT_ID_LAST == G_N_ELEMENTS(virshSecretEventCallbacks)); -static const vshCmdInfo info_secret_event[] = { - {.name = "help", - .data = N_("Secret Events") - }, - {.name = "desc", - .data = N_("List event types, or wait for secret events to occur") - }, - {.name = NULL} +static const vshCmdInfo info_secret_event = { + .help = N_("Secret Events"), + .desc = N_("List event types, or wait for secret events to occur"), }; static const vshCmdOptDef opts_secret_event[] = { @@ -852,43 +817,43 @@ const vshCmdDef secretCmds[] = { {.name = "secret-define", .handler = cmdSecretDefine, .opts = opts_secret_define, - .info = info_secret_define, + .info = &info_secret_define, .flags = 0 }, {.name = "secret-dumpxml", .handler = cmdSecretDumpXML, .opts = opts_secret_dumpxml, - .info = info_secret_dumpxml, + .info = &info_secret_dumpxml, .flags = 0 }, {.name = "secret-event", .handler = cmdSecretEvent, .opts = opts_secret_event, - .info = info_secret_event, + .info = &info_secret_event, .flags = 0 }, {.name = "secret-get-value", .handler = cmdSecretGetValue, .opts = opts_secret_get_value, - .info = info_secret_get_value, + .info = &info_secret_get_value, .flags = 0 }, {.name = "secret-list", .handler = cmdSecretList, .opts = opts_secret_list, - .info = info_secret_list, + .info = &info_secret_list, .flags = 0 }, {.name = "secret-set-value", .handler = cmdSecretSetValue, .opts = opts_secret_set_value, - .info = info_secret_set_value, + .info = &info_secret_set_value, .flags = 0 }, {.name = "secret-undefine", .handler = cmdSecretUndefine, .opts = opts_secret_undefine, - .info = info_secret_undefine, + .info = &info_secret_undefine, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 2049872322..31ab27b112 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -100,14 +100,9 @@ virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, /* * "snapshot-create" command */ -static const vshCmdInfo info_snapshot_create[] = { - {.name = "help", - .data = N_("Create a snapshot from XML") - }, - {.name = "desc", - .data = N_("Create a snapshot (disk and RAM) from XML") - }, - {.name = NULL} +static const vshCmdInfo info_snapshot_create = { + .help = N_("Create a snapshot from XML"), + .desc = N_("Create a snapshot (disk and RAM) from XML"), }; static const vshCmdOptDef opts_snapshot_create[] = { @@ -309,14 +304,9 @@ virshParseSnapshotDiskspec(vshControl *ctl, virBuffer *buf, const char *str) return ret; } -static const vshCmdInfo info_snapshot_create_as[] = { - {.name = "help", - .data = N_("Create a snapshot from a set of args") - }, - {.name = "desc", - .data = N_("Create a snapshot (disk and RAM) from arguments") - }, - {.name = NULL} +static const vshCmdInfo info_snapshot_create_as = { + .help = N_("Create a snapshot from a set of args"), + .desc = N_("Create a snapshot (disk and RAM) from arguments"), }; static const vshCmdOptDef opts_snapshot_create_as[] = { @@ -486,14 +476,9 @@ virshLookupSnapshot(vshControl *ctl, const vshCmd *cmd, /* * "snapshot-edit" command */ -static const vshCmdInfo info_snapshot_edit[] = { - {.name = "help", - .data = N_("edit XML for a snapshot") - }, - {.name = "desc", - .data = N_("Edit the domain snapshot XML for a named snapshot") - }, - {.name = NULL} +static const vshCmdInfo info_snapshot_edit = { + .help = N_("edit XML for a snapshot"), + .desc = N_("Edit the domain snapshot XML for a named snapshot"), }; static const vshCmdOptDef opts_snapshot_edit[] = { @@ -596,14 +581,9 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd) /* * "snapshot-current" command */ -static const vshCmdInfo info_snapshot_current[] = { - {.name = "help", - .data = N_("Get or set the current snapshot") - }, - {.name = "desc", - .data = N_("Get or set the current snapshot") - }, - {.name = NULL} +static const vshCmdInfo info_snapshot_current = { + .help = N_("Get or set the current snapshot"), + .desc = N_("Get or set the current snapshot"), }; static const vshCmdOptDef opts_snapshot_current[] = { @@ -808,14 +788,9 @@ virshSnapshotFilter(vshControl *ctl, virDomainSnapshotPtr snapshot, /* * "snapshot-info" command */ -static const vshCmdInfo info_snapshot_info[] = { - {.name = "help", - .data = N_("snapshot information") - }, - {.name = "desc", - .data = N_("Returns basic information about a snapshot.") - }, - {.name = NULL} +static const vshCmdInfo info_snapshot_info = { + .help = N_("snapshot information"), + .desc = N_("Returns basic information about a snapshot."), }; static const vshCmdOptDef opts_snapshot_info[] = { @@ -1342,14 +1317,9 @@ virshSnapshotListLookup(int id, bool parent, void *opaque) /* * "snapshot-list" command */ -static const vshCmdInfo info_snapshot_list[] = { - {.name = "help", - .data = N_("List snapshots for a domain") - }, - {.name = "desc", - .data = N_("Snapshot List") - }, - {.name = NULL} +static const vshCmdInfo info_snapshot_list = { + .help = N_("List snapshots for a domain"), + .desc = N_("Snapshot List"), }; static const vshCmdOptDef opts_snapshot_list[] = { @@ -1589,14 +1559,9 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) /* * "snapshot-dumpxml" command */ -static const vshCmdInfo info_snapshot_dumpxml[] = { - {.name = "help", - .data = N_("Dump XML for a domain snapshot") - }, - {.name = "desc", - .data = N_("Snapshot Dump XML") - }, - {.name = NULL} +static const vshCmdInfo info_snapshot_dumpxml = { + .help = N_("Dump XML for a domain snapshot"), + .desc = N_("Snapshot Dump XML"), }; static const vshCmdOptDef opts_snapshot_dumpxml[] = { @@ -1659,14 +1624,9 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) /* * "snapshot-parent" command */ -static const vshCmdInfo info_snapshot_parent[] = { - {.name = "help", - .data = N_("Get the name of the parent of a snapshot") - }, - {.name = "desc", - .data = N_("Extract the snapshot's parent, if any") - }, - {.name = NULL} +static const vshCmdInfo info_snapshot_parent = { + .help = N_("Get the name of the parent of a snapshot"), + .desc = N_("Extract the snapshot's parent, if any"), }; static const vshCmdOptDef opts_snapshot_parent[] = { @@ -1711,14 +1671,9 @@ cmdSnapshotParent(vshControl *ctl, const vshCmd *cmd) /* * "snapshot-revert" command */ -static const vshCmdInfo info_snapshot_revert[] = { - {.name = "help", - .data = N_("Revert a domain to a snapshot") - }, - {.name = "desc", - .data = N_("Revert domain to snapshot") - }, - {.name = NULL} +static const vshCmdInfo info_snapshot_revert = { + .help = N_("Revert a domain to a snapshot"), + .desc = N_("Revert domain to snapshot"), }; static const vshCmdOptDef opts_snapshot_revert[] = { @@ -1797,14 +1752,9 @@ cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd *cmd) /* * "snapshot-delete" command */ -static const vshCmdInfo info_snapshot_delete[] = { - {.name = "help", - .data = N_("Delete a domain snapshot") - }, - {.name = "desc", - .data = N_("Snapshot Delete") - }, - {.name = NULL} +static const vshCmdInfo info_snapshot_delete = { + .help = N_("Delete a domain snapshot"), + .desc = N_("Snapshot Delete"), }; static const vshCmdOptDef opts_snapshot_delete[] = { @@ -1872,61 +1822,61 @@ const vshCmdDef snapshotCmds[] = { {.name = "snapshot-create", .handler = cmdSnapshotCreate, .opts = opts_snapshot_create, - .info = info_snapshot_create, + .info = &info_snapshot_create, .flags = 0 }, {.name = "snapshot-create-as", .handler = cmdSnapshotCreateAs, .opts = opts_snapshot_create_as, - .info = info_snapshot_create_as, + .info = &info_snapshot_create_as, .flags = 0 }, {.name = "snapshot-current", .handler = cmdSnapshotCurrent, .opts = opts_snapshot_current, - .info = info_snapshot_current, + .info = &info_snapshot_current, .flags = 0 }, {.name = "snapshot-delete", .handler = cmdSnapshotDelete, .opts = opts_snapshot_delete, - .info = info_snapshot_delete, + .info = &info_snapshot_delete, .flags = 0 }, {.name = "snapshot-dumpxml", .handler = cmdSnapshotDumpXML, .opts = opts_snapshot_dumpxml, - .info = info_snapshot_dumpxml, + .info = &info_snapshot_dumpxml, .flags = 0 }, {.name = "snapshot-edit", .handler = cmdSnapshotEdit, .opts = opts_snapshot_edit, - .info = info_snapshot_edit, + .info = &info_snapshot_edit, .flags = 0 }, {.name = "snapshot-info", .handler = cmdSnapshotInfo, .opts = opts_snapshot_info, - .info = info_snapshot_info, + .info = &info_snapshot_info, .flags = 0 }, {.name = "snapshot-list", .handler = cmdSnapshotList, .opts = opts_snapshot_list, - .info = info_snapshot_list, + .info = &info_snapshot_list, .flags = 0 }, {.name = "snapshot-parent", .handler = cmdSnapshotParent, .opts = opts_snapshot_parent, - .info = info_snapshot_parent, + .info = &info_snapshot_parent, .flags = 0 }, {.name = "snapshot-revert", .handler = cmdDomainSnapshotRevert, .opts = opts_snapshot_revert, - .info = info_snapshot_revert, + .info = &info_snapshot_revert, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 329ca3a66c..0cb7262b67 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -164,14 +164,9 @@ virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, /* * "vol-create-as" command */ -static const vshCmdInfo info_vol_create_as[] = { - {.name = "help", - .data = N_("create a volume from a set of args") - }, - {.name = "desc", - .data = N_("Create a vol.") - }, - {.name = NULL} +static const vshCmdInfo info_vol_create_as = { + .help = N_("create a volume from a set of args"), + .desc = N_("Create a vol."), }; static const vshCmdOptDef opts_vol_create_as[] = { @@ -363,14 +358,9 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) /* * "vol-create" command */ -static const vshCmdInfo info_vol_create[] = { - {.name = "help", - .data = N_("create a vol from an XML file") - }, - {.name = "desc", - .data = N_("Create a vol.") - }, - {.name = NULL} +static const vshCmdInfo info_vol_create = { + .help = N_("create a vol from an XML file"), + .desc = N_("Create a vol."), }; static const vshCmdOptDef opts_vol_create[] = { @@ -426,14 +416,9 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) /* * "vol-create-from" command */ -static const vshCmdInfo info_vol_create_from[] = { - {.name = "help", - .data = N_("create a vol, using another volume as input") - }, - {.name = "desc", - .data = N_("Create a vol from an existing volume.") - }, - {.name = NULL} +static const vshCmdInfo info_vol_create_from = { + .help = N_("create a vol, using another volume as input"), + .desc = N_("Create a vol from an existing volume."), }; static const vshCmdOptDef opts_vol_create_from[] = { @@ -526,14 +511,9 @@ virshMakeCloneXML(const char *origxml, const char *newname) /* * "vol-clone" command */ -static const vshCmdInfo info_vol_clone[] = { - {.name = "help", - .data = N_("clone a volume.") - }, - {.name = "desc", - .data = N_("Clone an existing volume within the parent pool.") - }, - {.name = NULL} +static const vshCmdInfo info_vol_clone = { + .help = N_("clone a volume."), + .desc = N_("Clone an existing volume within the parent pool."), }; static const vshCmdOptDef opts_vol_clone[] = { @@ -616,14 +596,9 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) /* * "vol-upload" command */ -static const vshCmdInfo info_vol_upload[] = { - {.name = "help", - .data = N_("upload file contents to a volume") - }, - {.name = "desc", - .data = N_("Upload file contents to a volume") - }, - {.name = NULL} +static const vshCmdInfo info_vol_upload = { + .help = N_("upload file contents to a volume"), + .desc = N_("Upload file contents to a volume"), }; static const vshCmdOptDef opts_vol_upload[] = { @@ -729,14 +704,9 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) /* * "vol-download" command */ -static const vshCmdInfo info_vol_download[] = { - {.name = "help", - .data = N_("download volume contents to a file") - }, - {.name = "desc", - .data = N_("Download volume contents to a file") - }, - {.name = NULL} +static const vshCmdInfo info_vol_download = { + .help = N_("download volume contents to a file"), + .desc = N_("Download volume contents to a file"), }; static const vshCmdOptDef opts_vol_download[] = { @@ -845,14 +815,9 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd) /* * "vol-delete" command */ -static const vshCmdInfo info_vol_delete[] = { - {.name = "help", - .data = N_("delete a vol") - }, - {.name = "desc", - .data = N_("Delete a given vol.") - }, - {.name = NULL} +static const vshCmdInfo info_vol_delete = { + .help = N_("delete a vol"), + .desc = N_("Delete a given vol."), }; static const vshCmdOptDef opts_vol_delete[] = { @@ -894,14 +859,9 @@ cmdVolDelete(vshControl *ctl, const vshCmd *cmd) /* * "vol-wipe" command */ -static const vshCmdInfo info_vol_wipe[] = { - {.name = "help", - .data = N_("wipe a vol") - }, - {.name = "desc", - .data = N_("Ensure data previously on a volume is not accessible to future reads") - }, - {.name = NULL} +static const vshCmdInfo info_vol_wipe = { + .help = N_("wipe a vol"), + .desc = N_("Ensure data previously on a volume is not accessible to future reads"), }; static const vshCmdOptDef opts_vol_wipe[] = { @@ -978,14 +938,9 @@ virshVolumeTypeToString(int type) /* * "vol-info" command */ -static const vshCmdInfo info_vol_info[] = { - {.name = "help", - .data = N_("storage vol information") - }, - {.name = "desc", - .data = N_("Returns basic information about the storage vol.") - }, - {.name = NULL} +static const vshCmdInfo info_vol_info = { + .help = N_("storage vol information"), + .desc = N_("Returns basic information about the storage vol."), }; static const vshCmdOptDef opts_vol_info[] = { @@ -1058,16 +1013,11 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd) /* * "vol-resize" command */ -static const vshCmdInfo info_vol_resize[] = { - {.name = "help", - .data = N_("resize a vol") - }, - {.name = "desc", - .data = N_("Resizes a storage volume. This is safe only for storage " +static const vshCmdInfo info_vol_resize = { + .help = N_("resize a vol"), + .desc = N_("Resizes a storage volume. This is safe only for storage " "volumes not in use by an active guest.\n" - "See blockresize for live resizing.") - }, - {.name = NULL} + "See blockresize for live resizing."), }; static const vshCmdOptDef opts_vol_resize[] = { @@ -1153,14 +1103,9 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) /* * "vol-dumpxml" command */ -static const vshCmdInfo info_vol_dumpxml[] = { - {.name = "help", - .data = N_("vol information in XML") - }, - {.name = "desc", - .data = N_("Output the vol information as an XML dump to stdout.") - }, - {.name = NULL} +static const vshCmdInfo info_vol_dumpxml = { + .help = N_("vol information in XML"), + .desc = N_("Output the vol information as an XML dump to stdout."), }; static const vshCmdOptDef opts_vol_dumpxml[] = { @@ -1327,14 +1272,9 @@ virshStorageVolListCollect(vshControl *ctl, /* * "vol-list" command */ -static const vshCmdInfo info_vol_list[] = { - {.name = "help", - .data = N_("list vols") - }, - {.name = "desc", - .data = N_("Returns list of vols by pool.") - }, - {.name = NULL} +static const vshCmdInfo info_vol_list = { + .help = N_("list vols"), + .desc = N_("Returns list of vols by pool."), }; static const vshCmdOptDef opts_vol_list[] = { @@ -1485,14 +1425,9 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) /* * "vol-name" command */ -static const vshCmdInfo info_vol_name[] = { - {.name = "help", - .data = N_("returns the volume name for a given volume key or path") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_vol_name = { + .help = N_("returns the volume name for a given volume key or path"), + .desc = "", }; static const vshCmdOptDef opts_vol_name[] = { @@ -1516,14 +1451,9 @@ cmdVolName(vshControl *ctl, const vshCmd *cmd) /* * "vol-pool" command */ -static const vshCmdInfo info_vol_pool[] = { - {.name = "help", - .data = N_("returns the storage pool for a given volume key or path") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_vol_pool = { + .help = N_("returns the storage pool for a given volume key or path"), + .desc = "", }; static const vshCmdOptDef opts_vol_pool[] = { @@ -1571,14 +1501,9 @@ cmdVolPool(vshControl *ctl, const vshCmd *cmd) /* * "vol-key" command */ -static const vshCmdInfo info_vol_key[] = { - {.name = "help", - .data = N_("returns the volume key for a given volume name or path") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_vol_key = { + .help = N_("returns the volume key for a given volume name or path"), + .desc = "", }; static const vshCmdOptDef opts_vol_key[] = { @@ -1602,14 +1527,9 @@ cmdVolKey(vshControl *ctl, const vshCmd *cmd) /* * "vol-path" command */ -static const vshCmdInfo info_vol_path[] = { - {.name = "help", - .data = N_("returns the volume path for a given volume name or key") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_vol_path = { + .help = N_("returns the volume path for a given volume name or key"), + .desc = "", }; static const vshCmdOptDef opts_vol_path[] = { @@ -1639,97 +1559,97 @@ const vshCmdDef storageVolCmds[] = { {.name = "vol-clone", .handler = cmdVolClone, .opts = opts_vol_clone, - .info = info_vol_clone, + .info = &info_vol_clone, .flags = 0 }, {.name = "vol-create-as", .handler = cmdVolCreateAs, .opts = opts_vol_create_as, - .info = info_vol_create_as, + .info = &info_vol_create_as, .flags = 0 }, {.name = "vol-create", .handler = cmdVolCreate, .opts = opts_vol_create, - .info = info_vol_create, + .info = &info_vol_create, .flags = 0 }, {.name = "vol-create-from", .handler = cmdVolCreateFrom, .opts = opts_vol_create_from, - .info = info_vol_create_from, + .info = &info_vol_create_from, .flags = 0 }, {.name = "vol-delete", .handler = cmdVolDelete, .opts = opts_vol_delete, - .info = info_vol_delete, + .info = &info_vol_delete, .flags = 0 }, {.name = "vol-download", .handler = cmdVolDownload, .opts = opts_vol_download, - .info = info_vol_download, + .info = &info_vol_download, .flags = 0 }, {.name = "vol-dumpxml", .handler = cmdVolDumpXML, .opts = opts_vol_dumpxml, - .info = info_vol_dumpxml, + .info = &info_vol_dumpxml, .flags = 0 }, {.name = "vol-info", .handler = cmdVolInfo, .opts = opts_vol_info, - .info = info_vol_info, + .info = &info_vol_info, .flags = 0 }, {.name = "vol-key", .handler = cmdVolKey, .opts = opts_vol_key, - .info = info_vol_key, + .info = &info_vol_key, .flags = 0 }, {.name = "vol-list", .handler = cmdVolList, .opts = opts_vol_list, - .info = info_vol_list, + .info = &info_vol_list, .flags = 0 }, {.name = "vol-name", .handler = cmdVolName, .opts = opts_vol_name, - .info = info_vol_name, + .info = &info_vol_name, .flags = 0 }, {.name = "vol-path", .handler = cmdVolPath, .opts = opts_vol_path, - .info = info_vol_path, + .info = &info_vol_path, .flags = 0 }, {.name = "vol-pool", .handler = cmdVolPool, .opts = opts_vol_pool, - .info = info_vol_pool, + .info = &info_vol_pool, .flags = 0 }, {.name = "vol-resize", .handler = cmdVolResize, .opts = opts_vol_resize, - .info = info_vol_resize, + .info = &info_vol_resize, .flags = 0 }, {.name = "vol-upload", .handler = cmdVolUpload, .opts = opts_vol_upload, - .info = info_vol_upload, + .info = &info_vol_upload, .flags = 0 }, {.name = "vol-wipe", .handler = cmdVolWipe, .opts = opts_vol_wipe, - .info = info_vol_wipe, + .info = &info_vol_wipe, .flags = 0 }, {.name = NULL} diff --git a/tools/virsh.c b/tools/virsh.c index 0d860d0390..5b38881066 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -256,15 +256,10 @@ static const vshCmdOptDef opts_connect[] = { {.name = NULL} }; -static const vshCmdInfo info_connect[] = { - {.name = "help", - .data = N_("(re)connect to hypervisor") - }, - {.name = "desc", - .data = N_("Connect to local hypervisor. This is built-in " - "command after shell start up.") - }, - {.name = NULL} +static const vshCmdInfo info_connect = { + .help = N_("(re)connect to hypervisor"), + .desc = N_("Connect to local hypervisor. This is built-in " + "command after shell start up."), }; static bool @@ -464,8 +459,7 @@ virshUsage(void) cmd->flags & VSH_CMD_FLAG_HIDDEN) continue; fprintf(stdout, - " %-30s %s\n", cmd->name, - _(vshCmddefGetInfo(cmd, "help"))); + " %-30s %s\n", cmd->name, _(cmd->info->help)); } fprintf(stdout, "\n"); } @@ -795,7 +789,7 @@ static const vshCmdDef virshCmds[] = { {.name = "connect", .handler = cmdConnect, .opts = opts_connect, - .info = info_connect, + .info = &info_connect, .flags = VSH_CMD_FLAG_NOCONNECT }, {.name = NULL} diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 32e0c82f36..114ec2e8e7 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -167,14 +167,9 @@ vshAdmReconnect(vshControl *ctl) * 'uri' command */ -static const vshCmdInfo info_uri[] = { - {.name = "help", - .data = N_("print the admin server URI") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +static const vshCmdInfo info_uri = { + .help = N_("print the admin server URI"), + .desc = "", }; static bool @@ -198,14 +193,9 @@ cmdURI(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) * "version" command */ -static const vshCmdInfo info_version[] = { - {.name = "help", - .data = N_("show version") - }, - {.name = "desc", - .data = N_("Display the system and also the daemon version information.") - }, - {.name = NULL} +static const vshCmdInfo info_version = { + .help = N_("show version"), + .desc = N_("Display the system and also the daemon version information."), }; static bool @@ -270,14 +260,9 @@ static const vshCmdOptDef opts_connect[] = { {.name = NULL} }; -static const vshCmdInfo info_connect[] = { - {.name = "help", - .data = N_("connect to daemon's admin server") - }, - {.name = "desc", - .data = N_("Connect to a daemon's administrating server.") - }, - {.name = NULL} +static const vshCmdInfo info_connect = { + .help = N_("connect to daemon's admin server"), + .desc = N_("Connect to a daemon's administrating server."), }; static bool @@ -308,14 +293,9 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) * ------------------- */ -static const vshCmdInfo info_srv_list[] = { - {.name = "help", - .data = N_("list available servers on a daemon") - }, - {.name = "desc", - .data = N_("List all manageable servers on a daemon.") - }, - {.name = NULL} +static const vshCmdInfo info_srv_list = { + .help = N_("list available servers on a daemon"), + .desc = N_("List all manageable servers on a daemon."), }; static bool @@ -371,14 +351,9 @@ cmdSrvList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) * ------------------------------ */ -static const vshCmdInfo info_srv_threadpool_info[] = { - {.name = "help", - .data = N_("get server workerpool parameters") - }, - {.name = "desc", - .data = N_("Retrieve threadpool attributes from a server.") - }, - {.name = NULL} +static const vshCmdInfo info_srv_threadpool_info = { + .help = N_("get server workerpool parameters"), + .desc = N_("Retrieve threadpool attributes from a server."), }; static const vshCmdOptDef opts_srv_threadpool_info[] = { @@ -432,15 +407,10 @@ cmdSrvThreadpoolInfo(vshControl *ctl, const vshCmd *cmd) * ----------------------------- */ -static const vshCmdInfo info_srv_threadpool_set[] = { - {.name = "help", - .data = N_("set server workerpool parameters") - }, - {.name = "desc", - .data = N_("Tune threadpool attributes on a server. See OPTIONS for " - "currently supported attributes.") - }, - {.name = NULL} +static const vshCmdInfo info_srv_threadpool_set = { + .help = N_("set server workerpool parameters"), + .desc = N_("Tune threadpool attributes on a server. See OPTIONS for " + "currently supported attributes."), }; static const vshCmdOptDef opts_srv_threadpool_set[] = { @@ -539,14 +509,9 @@ cmdSrvThreadpoolSet(vshControl *ctl, const vshCmd *cmd) * --------------------------- */ -static const vshCmdInfo info_srv_clients_list[] = { - {.name = "help", - .data = N_("list clients connected to <server>") - }, - {.name = "desc", - .data = N_("List all manageable clients connected to <server>.") - }, - {.name = NULL} +static const vshCmdInfo info_srv_clients_list = { + .help = N_("list clients connected to <server>"), + .desc = N_("List all manageable clients connected to <server>."), }; static const vshCmdOptDef opts_srv_clients_list[] = { @@ -626,14 +591,9 @@ cmdSrvClientsList(vshControl *ctl, const vshCmd *cmd) * ------------------- */ -static const vshCmdInfo info_client_info[] = { - {.name = "help", - .data = N_("retrieve client's identity info from server") - }, - {.name = "desc", - .data = N_("Retrieve identity details about <client> from <server>") - }, - {.name = NULL} +static const vshCmdInfo info_client_info = { + .help = N_("retrieve client's identity info from server"), + .desc = N_("Retrieve identity details about <client> from <server>"), }; static const vshCmdOptDef opts_client_info[] = { @@ -712,15 +672,10 @@ cmdClientInfo(vshControl *ctl, const vshCmd *cmd) * ------------------------- */ -static const vshCmdInfo info_client_disconnect[] = { - {.name = "help", - .data = N_("force disconnect a client from the given server") - }, - {.name = "desc", - .data = N_("Force close a specific client's connection to the given " - "server.") - }, - {.name = NULL} +static const vshCmdInfo info_client_disconnect = { + .help = N_("force disconnect a client from the given server"), + .desc = N_("Force close a specific client's connection to the given " + "server."), }; static const vshCmdOptDef opts_client_disconnect[] = { @@ -779,14 +734,9 @@ cmdClientDisconnect(vshControl *ctl, const vshCmd *cmd) * --------------------------- */ -static const vshCmdInfo info_srv_clients_info[] = { - {.name = "help", - .data = N_("get server's client-related configuration limits") - }, - {.name = "desc", - .data = N_("Retrieve server's client-related configuration limits") - }, - {.name = NULL} +static const vshCmdInfo info_srv_clients_info = { + .help = N_("get server's client-related configuration limits"), + .desc = N_("Retrieve server's client-related configuration limits"), }; static const vshCmdOptDef opts_srv_clients_info[] = { @@ -837,15 +787,10 @@ cmdSrvClientsInfo(vshControl *ctl, const vshCmd *cmd) * -------------------------- */ -static const vshCmdInfo info_srv_clients_set[] = { - {.name = "help", - .data = N_("set server's client-related configuration limits") - }, - {.name = "desc", - .data = N_("Tune server's client-related configuration limits. " - "See OPTIONS for currently supported attributes.") - }, - {.name = NULL} +static const vshCmdInfo info_srv_clients_set = { + .help = N_("set server's client-related configuration limits"), + .desc = N_("Tune server's client-related configuration limits. " + "See OPTIONS for currently supported attributes."), }; static const vshCmdOptDef opts_srv_clients_set[] = { @@ -938,16 +883,11 @@ cmdSrvClientsSet(vshControl *ctl, const vshCmd *cmd) * Command server-update-tls * -------------------------- */ -static const vshCmdInfo info_srv_update_tls_file[] = { - {.name = "help", - .data = N_("notify server to update TLS related files online.") - }, - {.name = "desc", - .data = N_("notify server to update the CA cert, " +static const vshCmdInfo info_srv_update_tls_file = { + .help = N_("notify server to update TLS related files online."), + .desc = N_("notify server to update the CA cert, " "CA CRL, server cert / key without restarts. " - "See OPTIONS for currently supported attributes.") - }, - {.name = NULL} + "See OPTIONS for currently supported attributes."), }; static const vshCmdOptDef opts_srv_update_tls_file[] = { @@ -992,17 +932,12 @@ cmdSrvUpdateTlsFiles(vshControl *ctl, const vshCmd *cmd) * Command daemon-log-filters * -------------------------- */ -static const vshCmdInfo info_daemon_log_filters[] = { - {.name = "help", - .data = N_("fetch or set the currently defined set of logging filters on " - "daemon") - }, - {.name = "desc", - .data = N_("Depending on whether run with or without options, the command " +static const vshCmdInfo info_daemon_log_filters = { + .help = N_("fetch or set the currently defined set of logging filters on " + "daemon"), + .desc = N_("Depending on whether run with or without options, the command " "fetches or redefines the existing active set of filters on " - "daemon.") - }, - {.name = NULL} + "daemon."), }; static const vshCmdOptDef opts_daemon_log_filters[] = { @@ -1045,17 +980,12 @@ cmdDaemonLogFilters(vshControl *ctl, const vshCmd *cmd) * Command daemon-log-outputs * -------------------------- */ -static const vshCmdInfo info_daemon_log_outputs[] = { - {.name = "help", - .data = N_("fetch or set the currently defined set of logging outputs on " - "daemon") - }, - {.name = "desc", - .data = N_("Depending on whether run with or without options, the command " +static const vshCmdInfo info_daemon_log_outputs = { + .help = N_("fetch or set the currently defined set of logging outputs on " + "daemon"), + .desc = N_("Depending on whether run with or without options, the command " "fetches or redefines the existing active set of outputs on " - "daemon.") - }, - {.name = NULL} + "daemon."), }; static const vshCmdOptDef opts_daemon_timeout[] = { @@ -1087,14 +1017,9 @@ cmdDaemonTimeout(vshControl *ctl, const vshCmd *cmd) * Command daemon-timeout * -------------------------- */ -static const vshCmdInfo info_daemon_timeout[] = { - {.name = "help", - .data = N_("set the auto shutdown timeout of the daemon") - }, - {.name = "desc", - .data = N_("set the auto shutdown timeout of the daemon") - }, - {.name = NULL} +static const vshCmdInfo info_daemon_timeout = { + .help = N_("set the auto shutdown timeout of the daemon"), + .desc = N_("set the auto shutdown timeout of the daemon"), }; static const vshCmdOptDef opts_daemon_log_outputs[] = { @@ -1266,8 +1191,7 @@ vshAdmUsage(void) cmd->flags & VSH_CMD_FLAG_HIDDEN) continue; fprintf(stdout, - " %-30s %s\n", cmd->name, - _(vshCmddefGetInfo(cmd, "help"))); + " %-30s %s\n", cmd->name, _(cmd->info->help)); } fprintf(stdout, "\n"); } @@ -1409,19 +1333,19 @@ static const vshCmdDef vshAdmCmds[] = { {.name = "uri", .handler = cmdURI, .opts = NULL, - .info = info_uri, + .info = &info_uri, .flags = 0 }, {.name = "version", .handler = cmdVersion, .opts = NULL, - .info = info_version, + .info = &info_version, .flags = 0 }, {.name = "connect", .handler = cmdConnect, .opts = opts_connect, - .info = info_connect, + .info = &info_connect, .flags = VSH_CMD_FLAG_NOCONNECT }, {.name = NULL} @@ -1434,7 +1358,7 @@ static const vshCmdDef monitoringCmds[] = { {.name = "server-list", .handler = cmdSrvList, .opts = NULL, - .info = info_srv_list, + .info = &info_srv_list, .flags = 0 }, {.name = "srv-threadpool-info", @@ -1443,7 +1367,7 @@ static const vshCmdDef monitoringCmds[] = { {.name = "server-threadpool-info", .handler = cmdSrvThreadpoolInfo, .opts = opts_srv_threadpool_info, - .info = info_srv_threadpool_info, + .info = &info_srv_threadpool_info, .flags = 0 }, {.name = "srv-clients-list", @@ -1452,13 +1376,13 @@ static const vshCmdDef monitoringCmds[] = { {.name = "client-list", .handler = cmdSrvClientsList, .opts = opts_srv_clients_list, - .info = info_srv_clients_list, + .info = &info_srv_clients_list, .flags = 0 }, {.name = "client-info", .handler = cmdClientInfo, .opts = opts_client_info, - .info = info_client_info, + .info = &info_client_info, .flags = 0 }, {.name = "srv-clients-info", @@ -1467,7 +1391,7 @@ static const vshCmdDef monitoringCmds[] = { {.name = "server-clients-info", .handler = cmdSrvClientsInfo, .opts = opts_srv_clients_info, - .info = info_srv_clients_info, + .info = &info_srv_clients_info, .flags = 0 }, {.name = NULL} @@ -1480,13 +1404,13 @@ static const vshCmdDef managementCmds[] = { {.name = "server-threadpool-set", .handler = cmdSrvThreadpoolSet, .opts = opts_srv_threadpool_set, - .info = info_srv_threadpool_set, + .info = &info_srv_threadpool_set, .flags = 0 }, {.name = "client-disconnect", .handler = cmdClientDisconnect, .opts = opts_client_disconnect, - .info = info_client_disconnect, + .info = &info_client_disconnect, .flags = 0 }, {.name = "srv-clients-set", @@ -1495,7 +1419,7 @@ static const vshCmdDef managementCmds[] = { {.name = "server-clients-set", .handler = cmdSrvClientsSet, .opts = opts_srv_clients_set, - .info = info_srv_clients_set, + .info = &info_srv_clients_set, .flags = 0 }, {.name = "srv-update-tls", @@ -1504,25 +1428,25 @@ static const vshCmdDef managementCmds[] = { {.name = "server-update-tls", .handler = cmdSrvUpdateTlsFiles, .opts = opts_srv_update_tls_file, - .info = info_srv_update_tls_file, + .info = &info_srv_update_tls_file, .flags = 0 }, {.name = "daemon-log-filters", .handler = cmdDaemonLogFilters, .opts = opts_daemon_log_filters, - .info = info_daemon_log_filters, + .info = &info_daemon_log_filters, .flags = 0 }, {.name = "daemon-log-outputs", .handler = cmdDaemonLogOutputs, .opts = opts_daemon_log_outputs, - .info = info_daemon_log_outputs, + .info = &info_daemon_log_outputs, .flags = 0 }, {.name = "daemon-timeout", .handler = cmdDaemonTimeout, .opts = opts_daemon_timeout, - .info = info_daemon_timeout, + .info = &info_daemon_timeout, .flags = 0 }, {.name = NULL} diff --git a/tools/vsh.c b/tools/vsh.c index 55921a0759..688161beda 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -239,22 +239,6 @@ vshReportError(vshControl *ctl) */ static int disconnected; /* we may have been disconnected */ -/* --------------- - * Utils for work with command definition - * --------------- - */ -const char * -vshCmddefGetInfo(const vshCmdDef * cmd, const char *name) -{ - const vshCmdInfo *info; - - for (info = cmd->info; info && info->name; info++) { - if (STREQ(info->name, name)) - return info->data; - } - return NULL; -} - /* Check if the internal command definitions are correct. * None of the errors are to be marked as translatable. */ static int @@ -263,7 +247,6 @@ vshCmddefCheckInternals(vshControl *ctl, bool missingCompleters) { size_t i; - const char *help = NULL; bool seenOptionalOption = false; g_auto(virBuffer) complbuf = VIR_BUFFER_INITIALIZER; @@ -308,7 +291,7 @@ vshCmddefCheckInternals(vshControl *ctl, } /* Each command has to provide a non-empty help string. */ - if (!(help = vshCmddefGetInfo(cmd, "help")) || !*help) { + if (!cmd->info || !cmd->info->help || !*cmd->info->help) { vshError(ctl, "command '%s' lacks help", cmd->name); return -1; } @@ -627,8 +610,7 @@ vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp) if (cmd->alias || cmd->flags & VSH_CMD_FLAG_HIDDEN) continue; - vshPrint(ctl, " %-30s %s\n", cmd->name, - _(vshCmddefGetInfo(cmd, "help"))); + vshPrint(ctl, " %-30s %s\n", cmd->name, _(cmd->info->help)); } return true; @@ -637,13 +619,11 @@ vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp) static bool vshCmddefHelp(const vshCmdDef *def) { - const char *desc = NULL; char buf[256]; bool shortopt = false; /* true if 'arg' works instead of '--opt arg' */ fputs(_(" NAME\n"), stdout); - fprintf(stdout, " %s - %s\n", def->name, - _(vshCmddefGetInfo(def, "help"))); + fprintf(stdout, " %s - %s\n", def->name, _(def->info->help)); fputs(_("\n SYNOPSIS\n"), stdout); fprintf(stdout, " %s", def->name); @@ -695,11 +675,10 @@ vshCmddefHelp(const vshCmdDef *def) } fputc('\n', stdout); - desc = vshCmddefGetInfo(def, "desc"); - if (desc && *desc) { + if (def->info->desc && *def->info->desc) { /* Print the description only if it's not empty. */ fputs(_("\n DESCRIPTION\n"), stdout); - fprintf(stdout, " %s\n", _(desc)); + fprintf(stdout, " %s\n", _(def->info->desc)); } if (def->opts && def->opts->name) { @@ -3078,15 +3057,10 @@ const vshCmdOptDef opts_help[] = { {.name = NULL} }; -const vshCmdInfo info_help[] = { - {.name = "help", - .data = N_("print help") - }, - {.name = "desc", - .data = N_("Prints global help, command specific help, or help for a\n" - " group of related commands") - }, - {.name = NULL} +const vshCmdInfo info_help = { + .help = N_("print help"), + .desc = N_("Prints global help, command specific help, or help for a\n" + " group of related commands"), }; bool @@ -3107,8 +3081,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) if (def->alias || def->flags & VSH_CMD_FLAG_HIDDEN) continue; - vshPrint(ctl, " %-30s %s\n", def->name, - _(vshCmddefGetInfo(def, "help"))); + vshPrint(ctl, " %-30s %s\n", def->name, _(def->info->help)); } vshPrint(ctl, "\n"); @@ -3137,14 +3110,9 @@ const vshCmdOptDef opts_cd[] = { {.name = NULL} }; -const vshCmdInfo info_cd[] = { - {.name = "help", - .data = N_("change the current directory") - }, - {.name = "desc", - .data = N_("Change the current directory.") - }, - {.name = NULL} +const vshCmdInfo info_cd = { + .help = N_("change the current directory"), + .desc = N_("Change the current directory."), }; bool @@ -3204,14 +3172,9 @@ const vshCmdOptDef opts_echo[] = { {.name = NULL} }; -const vshCmdInfo info_echo[] = { - {.name = "help", - .data = N_("echo arguments. Used for internal testing.") - }, - {.name = "desc", - .data = N_("Echo back arguments, possibly with quoting. Used for internal testing.") - }, - {.name = NULL} +const vshCmdInfo info_echo = { + .help = N_("echo arguments. Used for internal testing."), + .desc = N_("Echo back arguments, possibly with quoting. Used for internal testing."), }; /* Exists mainly for debugging virsh, but also handy for adding back @@ -3266,14 +3229,9 @@ cmdEcho(vshControl *ctl, const vshCmd *cmd) return true; } -const vshCmdInfo info_pwd[] = { - {.name = "help", - .data = N_("print the current directory") - }, - {.name = "desc", - .data = N_("Print the current directory.") - }, - {.name = NULL} +const vshCmdInfo info_pwd = { + .help = N_("print the current directory"), + .desc = N_("Print the current directory."), }; bool @@ -3286,14 +3244,9 @@ cmdPwd(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) return true; } -const vshCmdInfo info_quit[] = { - {.name = "help", - .data = N_("quit this interactive terminal") - }, - {.name = "desc", - .data = "" - }, - {.name = NULL} +const vshCmdInfo info_quit = { + .help = N_("quit this interactive terminal"), + .desc = "", }; bool @@ -3318,14 +3271,9 @@ const vshCmdOptDef opts_selftest[] = { }, {.name = NULL} }; -const vshCmdInfo info_selftest[] = { - {.name = "help", - .data = N_("internal command for testing virt shells") - }, - {.name = "desc", - .data = N_("internal use only") - }, - {.name = NULL} +const vshCmdInfo info_selftest = { + .help = N_("internal command for testing virt shells"), + .desc = N_("internal use only"), }; bool @@ -3363,14 +3311,9 @@ const vshCmdOptDef opts_complete[] = { {.name = NULL} }; -const vshCmdInfo info_complete[] = { - {.name = "help", - .data = N_("internal command for autocompletion") - }, - {.name = "desc", - .data = N_("internal use only") - }, - {.name = NULL} +const vshCmdInfo info_complete = { + .help = N_("internal command for autocompletion"), + .desc = N_("internal use only"), }; diff --git a/tools/vsh.h b/tools/vsh.h index a191b50c2d..c8015b8dd7 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -119,15 +119,12 @@ typedef char **(*vshCompleter)(vshControl *ctl, unsigned int flags); /* - * vshCmdInfo -- name/value pair for information about command - * - * Commands should have at least the following names: * "help" - short description of command * "desc" - description of command, or empty string */ struct _vshCmdInfo { - const char *name; /* name of information, or NULL for list end */ - const char *data; /* non-NULL information */ + const char *help; /* short description of command */ + const char *desc; /* description of command */ }; /* @@ -248,7 +245,6 @@ void vshOutputLogFile(vshControl *ctl, int log_level, const char *format, G_GNUC_PRINTF(3, 0); void vshCloseLogFile(vshControl *ctl); -const char *vshCmddefGetInfo(const vshCmdDef *cmd, const char *info); const vshCmdDef *vshCmddefSearch(const char *cmdname); const vshCmdGrp *vshCmdGrpSearch(const char *grpname); bool vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp); @@ -374,17 +370,17 @@ int vshEventWait(vshControl *ctl); /* generic commands */ extern const vshCmdOptDef opts_help[]; -extern const vshCmdInfo info_help[]; +extern const vshCmdInfo info_help; extern const vshCmdOptDef opts_cd[]; -extern const vshCmdInfo info_cd[]; +extern const vshCmdInfo info_cd; extern const vshCmdOptDef opts_echo[]; -extern const vshCmdInfo info_echo[]; -extern const vshCmdInfo info_pwd[]; -extern const vshCmdInfo info_quit[]; +extern const vshCmdInfo info_echo; +extern const vshCmdInfo info_pwd; +extern const vshCmdInfo info_quit; extern const vshCmdOptDef opts_selftest[]; -extern const vshCmdInfo info_selftest[]; +extern const vshCmdInfo info_selftest; extern const vshCmdOptDef opts_complete[]; -extern const vshCmdInfo info_complete[]; +extern const vshCmdInfo info_complete; bool cmdHelp(vshControl *ctl, const vshCmd *cmd); bool cmdCd(vshControl *ctl, const vshCmd *cmd); @@ -399,7 +395,7 @@ bool cmdComplete(vshControl *ctl, const vshCmd *cmd); .name = "cd", \ .handler = cmdCd, \ .opts = opts_cd, \ - .info = info_cd, \ + .info = &info_cd, \ .flags = VSH_CMD_FLAG_NOCONNECT \ } @@ -408,7 +404,7 @@ bool cmdComplete(vshControl *ctl, const vshCmd *cmd); .name = "echo", \ .handler = cmdEcho, \ .opts = opts_echo, \ - .info = info_echo, \ + .info = &info_echo, \ .flags = VSH_CMD_FLAG_NOCONNECT \ } @@ -417,7 +413,7 @@ bool cmdComplete(vshControl *ctl, const vshCmd *cmd); .name = "exit", \ .handler = cmdQuit, \ .opts = NULL, \ - .info = info_quit, \ + .info = &info_quit, \ .flags = VSH_CMD_FLAG_NOCONNECT \ } @@ -426,7 +422,7 @@ bool cmdComplete(vshControl *ctl, const vshCmd *cmd); .name = "help", \ .handler = cmdHelp, \ .opts = opts_help, \ - .info = info_help, \ + .info = &info_help, \ .flags = VSH_CMD_FLAG_NOCONNECT \ } @@ -435,7 +431,7 @@ bool cmdComplete(vshControl *ctl, const vshCmd *cmd); .name = "pwd", \ .handler = cmdPwd, \ .opts = NULL, \ - .info = info_pwd, \ + .info = &info_pwd, \ .flags = VSH_CMD_FLAG_NOCONNECT \ } @@ -444,7 +440,7 @@ bool cmdComplete(vshControl *ctl, const vshCmd *cmd); .name = "quit", \ .handler = cmdQuit, \ .opts = NULL, \ - .info = info_quit, \ + .info = &info_quit, \ .flags = VSH_CMD_FLAG_NOCONNECT \ } @@ -453,7 +449,7 @@ bool cmdComplete(vshControl *ctl, const vshCmd *cmd); .name = "self-test", \ .handler = cmdSelfTest, \ .opts = opts_selftest, \ - .info = info_selftest, \ + .info = &info_selftest, \ .flags = VSH_CMD_FLAG_NOCONNECT | VSH_CMD_FLAG_HIDDEN, \ } @@ -462,7 +458,7 @@ bool cmdComplete(vshControl *ctl, const vshCmd *cmd); .name = "complete", \ .handler = cmdComplete, \ .opts = opts_complete, \ - .info = info_complete, \ + .info = &info_complete, \ .flags = VSH_CMD_FLAG_NOCONNECT | VSH_CMD_FLAG_HIDDEN, \ } -- 2.44.0
Extract flag check to a separate variable and replace ternary operators by normal conditions and directly output the text rather than using extra variable to improve readability. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 688161beda..add50fe670 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -630,47 +630,63 @@ vshCmddefHelp(const vshCmdDef *def) if (def->opts) { const vshCmdOptDef *opt; for (opt = def->opts; opt->name; opt++) { - const char *fmt = "%s"; + bool required_option = opt->flags & VSH_OFLAG_REQ; + switch (opt->type) { case VSH_OT_BOOL: - fmt = "[--%s]"; + fprintf(stdout, " [--%s]", opt->name); break; + case VSH_OT_INT: - /* xgettext:c-format */ - fmt = ((opt->flags & VSH_OFLAG_REQ) ? "<%s>" - : _("[--%1$s <number>]")); + if (required_option) { + fprintf(stdout, " <%s>", opt->name); + } else { + fprintf(stdout, _(" [--%1$s <number>]"), opt->name); + } + if (!(opt->flags & VSH_OFLAG_REQ_OPT)) shortopt = true; break; + case VSH_OT_STRING: - /* xgettext:c-format */ - fmt = _("[--%1$s <string>]"); + fprintf(stdout, _(" [--%1$s <string>]"), opt->name); + if (!(opt->flags & VSH_OFLAG_REQ_OPT)) shortopt = true; break; + case VSH_OT_DATA: - fmt = ((opt->flags & VSH_OFLAG_REQ) ? "<%s>" : "[<%s>]"); + if (required_option) { + fprintf(stdout, " <%s>", opt->name); + } else { + fprintf(stdout, " [<%s>]", opt->name); + } + if (!(opt->flags & VSH_OFLAG_REQ_OPT)) shortopt = true; break; + case VSH_OT_ARGV: - /* xgettext:c-format */ if (shortopt) { - fmt = (opt->flags & VSH_OFLAG_REQ) - ? _("{[--%1$s] <string>}...") - : _("[[--%1$s] <string>]..."); + if (required_option) { + fprintf(stdout, _(" {[--%1$s] <string>}..."), opt->name); + } else { + fprintf(stdout, _(" [[--%1$s] <string>]..."), opt->name); + } } else { - fmt = (opt->flags & VSH_OFLAG_REQ) ? _("<%1$s>...") - : _("[<%1$s>]..."); + if (required_option) { + fprintf(stdout, " <%s>...", opt->name); + } else { + fprintf(stdout, " [<%s>]...", opt->name); + } } break; + case VSH_OT_ALIAS: case VSH_OT_NONE: /* aliases are intentionally undocumented */ continue; } - fputc(' ', stdout); - fprintf(stdout, fmt, opt->name); } } fputc('\n', stdout); -- 2.44.0
Extract flag check to a separate variable and replace ternary operators by normal conditions and use allocated buffer instead of a static one to improve readability. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index add50fe670..af5a576932 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -619,7 +619,6 @@ vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp) static bool vshCmddefHelp(const vshCmdDef *def) { - char buf[256]; bool shortopt = false; /* true if 'arg' works instead of '--opt arg' */ fputs(_(" NAME\n"), stdout); @@ -701,33 +700,44 @@ vshCmddefHelp(const vshCmdDef *def) const vshCmdOptDef *opt; fputs(_("\n OPTIONS\n"), stdout); for (opt = def->opts; opt->name; opt++) { + bool required_option = opt->flags & VSH_OFLAG_REQ; + g_autofree char *optstr = NULL; + switch (opt->type) { case VSH_OT_BOOL: - g_snprintf(buf, sizeof(buf), "--%s", opt->name); + optstr = g_strdup_printf("--%s", opt->name); break; + case VSH_OT_INT: - g_snprintf(buf, sizeof(buf), - (opt->flags & VSH_OFLAG_REQ) ? _("[--%1$s] <number>") - : _("--%1$s <number>"), opt->name); + if (required_option) { + optstr = g_strdup_printf(_("[--%1$s] <number>"), opt->name); + } else { + optstr = g_strdup_printf(_("--%1$s <number>"), opt->name); + } break; + case VSH_OT_STRING: - g_snprintf(buf, sizeof(buf), _("--%1$s <string>"), opt->name); + optstr = g_strdup_printf(_("--%1$s <string>"), opt->name); break; + case VSH_OT_DATA: - g_snprintf(buf, sizeof(buf), _("[--%1$s] <string>"), - opt->name); + optstr = g_strdup_printf(_("[--%1$s] <string>"), opt->name); break; + case VSH_OT_ARGV: - g_snprintf(buf, sizeof(buf), - shortopt ? _("[--%1$s] <string>") : _("<%1$s>"), - opt->name); + if (shortopt) { + optstr = g_strdup_printf(_("[--%1$s] <string>"), opt->name); + } else { + optstr = g_strdup_printf("<%s>", opt->name); + } break; + case VSH_OT_ALIAS: case VSH_OT_NONE: continue; } - fprintf(stdout, " %-15s %s\n", buf, _(opt->help)); + fprintf(stdout, " %-15s %s\n", optstr, _(opt->help)); } } fputc('\n', stdout); -- 2.44.0
Declare one argument per line, separate disticnt conditions by newline, move some checks earlier. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 69 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index af5a576932..de68f93a1f 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -468,9 +468,14 @@ static vshCmdOptDef helpopt = { .type = VSH_OT_BOOL, .help = N_("print help for this function") }; + static const vshCmdOptDef * -vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, - uint64_t *opts_seen, size_t *opt_index, char **optstr, +vshCmddefGetOption(vshControl *ctl, + const vshCmdDef *cmd, + const char *name, + uint64_t *opts_seen, + size_t *opt_index, + char **optstr, bool report) { size_t i; @@ -482,39 +487,43 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, for (i = 0; cmd->opts && cmd->opts[i].name; i++) { const vshCmdOptDef *opt = &cmd->opts[i]; - if (STREQ(opt->name, name)) { - if (opt->type == VSH_OT_ALIAS) { - char *value; - - /* Two types of replacements: - opt->help = "string": straight replacement of name - opt->help = "string=value": treat boolean flag as - alias of option and its default value */ - alias = g_strdup(opt->help); - name = alias; - if ((value = strchr(name, '='))) { - *value = '\0'; - if (*optstr) { - if (report) - vshError(ctl, _("invalid '=' after option --%1$s"), - opt->name); - return NULL; - } - *optstr = g_strdup(value + 1); + if (STRNEQ(opt->name, name)) + continue; + + if (opt->type == VSH_OT_ALIAS) { + char *value; + + /* Two types of replacements: + opt->help = "string": straight replacement of name + opt->help = "string=value": treat boolean flag as + alias of option and its default value */ + alias = g_strdup(opt->help); + name = alias; + if ((value = strchr(name, '='))) { + *value = '\0'; + if (*optstr) { + if (report) + vshError(ctl, _("invalid '=' after option --%1$s"), + opt->name); + return NULL; } - continue; + *optstr = g_strdup(value + 1); } - if ((*opts_seen & (1ULL << i)) && opt->type != VSH_OT_ARGV) { - if (report) - vshError(ctl, _("option --%1$s already seen"), name); - return NULL; - } - *opts_seen |= 1ULL << i; - *opt_index = i; - return opt; + continue; } + + if ((*opts_seen & (1ULL << i)) && opt->type != VSH_OT_ARGV) { + if (report) + vshError(ctl, _("option --%1$s already seen"), name); + return NULL; + } + + *opts_seen |= 1ULL << i; + *opt_index = i; + return opt; } + /* The 'help' command ignores extra options */ if (STRNEQ(cmd->name, "help") && report) { vshError(ctl, _("command '%1$s' doesn't support option --%2$s"), cmd->name, name); -- 2.44.0
There's just one command taking a list of domains as argument, thus declare it inline. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh-domain-monitor.c | 6 +++++- tools/virsh.h | 12 ------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 277eb71342..7a25318bbd 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2048,7 +2048,11 @@ static const vshCmdOptDef opts_domstats[] = { .type = VSH_OT_BOOL, .help = N_("report only stats that are accessible instantly"), }, - VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("list of domains to get stats for"), 0), + {.name = "domain", + .type = VSH_OT_ARGV, + .help = N_("list of domains to get stats for"), + .completer = virshDomainNameCompleter, + }, {.name = NULL} }; diff --git a/tools/virsh.h b/tools/virsh.h index 6acefa7f9d..877b290e3a 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -119,18 +119,6 @@ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), \ oflags, cflags) -#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(_helpstr, cflags) \ - {.name = "domain", \ - .type = VSH_OT_ARGV, \ - .flags = VSH_OFLAG_NONE, \ - .help = _helpstr, \ - .completer = virshDomainNameCompleter, \ - .completer_flags = cflags, \ - } - -#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL(cflags) \ - VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("domain name, id or uuid"), cflags) - typedef struct _virshControl virshControl; typedef struct _virshCtrlData virshCtrlData; -- 2.44.0
Add 'positional' and 'required' fields to vshCmdOptDef, which will explicitly track the two properties of arguments. To ensure that we have proper coverage, add checks to vshCmddefCheckInternals validating the state of the above flags by infering it from existing data. This conversion will allow us: - remove VSH_OT_DATA in favor of VSH_OT_STRING - use VSH_OT_INT when required both as positional and non-positional - properly annotate which VSH_OT_ARGV are positional and which are not (currently inferred by whether an previous positional option exists) Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh-domain-monitor.c | 5 ++ tools/virsh-domain.c | 118 +++++++++++++++++++++++++++++++++++ tools/virsh-host.c | 10 +++ tools/virsh-interface.c | 12 ++++ tools/virsh-network.c | 16 ++++- tools/virsh-nodedev.c | 20 ++++++ tools/virsh-nwfilter.c | 10 +++ tools/virsh-pool.c | 8 +++ tools/virsh-secret.c | 8 +++ tools/virsh-snapshot.c | 2 + tools/virsh-volume.c | 12 ++++ tools/virsh.h | 16 +++-- tools/virt-admin.c | 22 +++++++ tools/vsh.c | 32 +++++++++- tools/vsh.h | 2 + 15 files changed, 286 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 7a25318bbd..573451c678 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -738,6 +738,8 @@ static const vshCmdOptDef opts_domif_getlink[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "interface", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainInterfaceCompleter, .help = N_("interface device (MAC Address)") @@ -1038,6 +1040,8 @@ static const vshCmdOptDef opts_domifstat[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "interface", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainInterfaceCompleter, .help = N_("interface device specified by name or MAC Address") @@ -2050,6 +2054,7 @@ static const vshCmdOptDef opts_domstats[] = { }, {.name = "domain", .type = VSH_OT_ARGV, + .positional = true, .help = N_("list of domains to get stats for"), .completer = virshDomainNameCompleter, }, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6768a1f24e..7a63757131 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -420,11 +420,15 @@ static const vshCmdOptDef opts_attach_disk[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "source", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ | VSH_OFLAG_EMPTY_OK, .help = N_("source of disk device or name of network disk") }, {.name = "target", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("target of disk device") @@ -812,11 +816,15 @@ static const vshCmdOptDef opts_attach_interface[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "type", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("network interface type") }, {.name = "source", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("source of network interface") }, @@ -1188,6 +1196,8 @@ static const vshCmdOptDef opts_blkdeviotune[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("block device") @@ -1981,6 +1991,8 @@ static const vshCmdOptDef opts_blockcommit[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "path", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("fully-qualified path of disk") @@ -2200,6 +2212,8 @@ static const vshCmdOptDef opts_blockcopy[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "path", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("fully-qualified path of source disk") @@ -2532,6 +2546,8 @@ static const vshCmdOptDef opts_blockjob[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "path", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("fully-qualified path of disk") @@ -2743,6 +2759,8 @@ static const vshCmdOptDef opts_blockpull[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "path", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("fully-qualified path of disk") @@ -2885,6 +2903,8 @@ static const vshCmdOptDef opts_blockresize[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "path", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("Fully-qualified path of block device") @@ -3042,12 +3062,16 @@ static const vshCmdOptDef opts_domif_setlink[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "interface", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainInterfaceCompleter, .help = N_("interface device (MAC Address)") }, {.name = "state", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainInterfaceStateCompleter, .help = N_("new state of the device") @@ -3188,6 +3212,8 @@ static const vshCmdOptDef opts_domiftune[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "interface", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainInterfaceCompleter, .help = N_("interface device (MAC Address)") @@ -3413,6 +3439,8 @@ static const vshCmdOptDef opts_dom_pm_suspend[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_RUNNING), {.name = "target", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshNodeSuspendTargetCompleter, .help = N_("mem(Suspend-to-RAM), " @@ -4096,6 +4124,8 @@ static const vshCmdOptDef opts_save[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "file", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("where to save the data") }, @@ -4445,6 +4475,8 @@ static const vshCmdInfo info_save_image_dumpxml = { static const vshCmdOptDef opts_save_image_dumpxml[] = { {.name = "file", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("saved state file to read") }, @@ -4502,11 +4534,15 @@ static const vshCmdInfo info_save_image_define = { static const vshCmdOptDef opts_save_image_define[] = { {.name = "file", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("saved state file to modify") }, {.name = "xml", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompletePathLocalExisting, .help = N_("filename containing updated XML for the target") @@ -4565,6 +4601,8 @@ static const vshCmdInfo info_save_image_edit = { static const vshCmdOptDef opts_save_image_edit[] = { {.name = "file", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("saved state file to edit") }, @@ -4904,6 +4942,8 @@ static const vshCmdOptDef opts_managed_save_define[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE), {.name = "xml", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompletePathLocalExisting, .help = N_("filename containing updated XML for the target") @@ -5180,6 +5220,8 @@ static const vshCmdInfo info_restore = { static const vshCmdOptDef opts_restore[] = { {.name = "file", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("the state to restore") }, @@ -5263,6 +5305,8 @@ static const vshCmdOptDef opts_dump[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "file", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("where to dump the core") }, @@ -5562,12 +5606,16 @@ static const vshCmdOptDef opts_setLifecycleAction[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "type", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainLifecycleCompleter, .help = N_("lifecycle type to modify") }, {.name = "action", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainLifecycleActionCompleter, .help = N_("lifecycle action to set") @@ -5654,11 +5702,15 @@ static const vshCmdOptDef opts_set_user_password[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "user", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("the username") }, {.name = "password", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("the new password") @@ -7074,6 +7126,8 @@ static const vshCmdOptDef opts_setvcpus[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "count", .type = VSH_OT_INT, + .required = true, + .positional = true, .flags = VSH_OFLAG_REQ, .help = N_("number of virtual CPUs") }, @@ -7240,6 +7294,8 @@ static const vshCmdOptDef opts_setvcpu[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "vcpulist", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainVcpulistCompleter, .help = N_("ids of vcpus to manipulate") @@ -7314,12 +7370,16 @@ static const vshCmdOptDef opts_domblkthreshold[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "dev", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("device to set threshold for") }, {.name = "threshold", .type = VSH_OT_INT, + .required = true, + .positional = true, .flags = VSH_OFLAG_REQ, .help = N_("threshold as a scaled number (by default bytes)") }, @@ -7442,12 +7502,16 @@ static const vshCmdOptDef opts_iothreadpin[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "iothread", .type = VSH_OT_INT, + .required = true, + .positional = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainIOThreadIdCompleter, .help = N_("IOThread ID number") }, {.name = "cpulist", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainCpulistCompleter, .help = N_("host cpu number(s) to set") @@ -7515,6 +7579,8 @@ static const vshCmdOptDef opts_iothreadadd[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "id", .type = VSH_OT_INT, + .required = true, + .positional = true, .flags = VSH_OFLAG_REQ, .help = N_("iothread for the new IOThread") }, @@ -7571,6 +7637,8 @@ static const vshCmdOptDef opts_iothreadset[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "id", .type = VSH_OT_INT, + .required = true, + .positional = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainIOThreadIdCompleter, .help = N_("iothread id of existing IOThread") @@ -7687,6 +7755,8 @@ static const vshCmdOptDef opts_iothreaddel[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "id", .type = VSH_OT_INT, + .required = true, + .positional = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainIOThreadIdCompleter, .help = N_("iothread_id for the IOThread to delete") @@ -8296,6 +8366,8 @@ static const vshCmdOptDef opts_metadata[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "uri", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("URI of the namespace") }, @@ -8474,6 +8546,7 @@ static const vshCmdOptDef opts_send_key[] = { }, {.name = "keycode", .type = VSH_OT_ARGV, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshKeycodeNameCompleter, .help = N_("the key code") @@ -8558,12 +8631,16 @@ static const vshCmdOptDef opts_send_process_signal[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "pid", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("the process ID") }, {.name = "signame", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainSignalCompleter, .help = N_("the signal number or name") @@ -8652,6 +8729,8 @@ static const vshCmdOptDef opts_setmem[] = { }, {.name = "size", .type = VSH_OT_INT, + .required = true, + .positional = true, .flags = VSH_OFLAG_REQ, .help = N_("new memory size, as scaled integer (default KiB)") }, @@ -8721,6 +8800,8 @@ static const vshCmdOptDef opts_setmaxmem[] = { }, {.name = "size", .type = VSH_OT_INT, + .required = true, + .positional = true, .flags = VSH_OFLAG_REQ, .help = N_("new maximum memory size, as scaled integer (default KiB)") }, @@ -9494,12 +9575,16 @@ static const vshCmdOptDef opts_dom_fd_associate[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "name", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("name of the FD group") }, {.name = "pass-fds", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("file descriptors N,M,... to associate") @@ -9576,6 +9661,7 @@ static const vshCmdOptDef opts_qemu_monitor_command[] = { }, {.name = "cmd", .type = VSH_OT_ARGV, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("command") }, @@ -9911,6 +9997,8 @@ static const vshCmdInfo info_qemu_attach = { static const vshCmdOptDef opts_qemu_attach[] = { {.name = "pid", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("pid") @@ -9968,6 +10056,7 @@ static const vshCmdOptDef opts_qemu_agent_command[] = { }, {.name = "cmd", .type = VSH_OT_ARGV, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("command") }, @@ -10064,6 +10153,7 @@ static const vshCmdOptDef opts_lxc_enter_namespace[] = { }, {.name = "cmd", .type = VSH_OT_ARGV, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("command to run") }, @@ -10243,11 +10333,15 @@ static const vshCmdInfo info_domxmlfromnative = { static const vshCmdOptDef opts_domxmlfromnative[] = { {.name = "format", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("source config data format") }, {.name = "config", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompletePathLocalExisting, .help = N_("config data file to import from") @@ -10291,6 +10385,8 @@ static const vshCmdInfo info_domxmltonative = { static const vshCmdOptDef opts_domxmltonative[] = { {.name = "format", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("target config data type format") }, @@ -10358,6 +10454,8 @@ static const vshCmdInfo info_domname = { static const vshCmdOptDef opts_domname[] = { {.name = "domain", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainUUIDCompleter, .help = N_("domain id or uuid") @@ -10391,6 +10489,8 @@ static const vshCmdOptDef opts_domrename[] = { VIR_CONNECT_LIST_DOMAINS_INACTIVE), {.name = "new-name", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("new domain name") @@ -10493,6 +10593,8 @@ static const vshCmdOptDef opts_migrate[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "desturi", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("connection URI of the destination host as seen from the client(normal migration) or source(p2p migration)") @@ -11190,6 +11292,8 @@ static const vshCmdOptDef opts_migrate_setmaxdowntime[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "downtime", .type = VSH_OT_INT, + .required = true, + .positional = true, .flags = VSH_OFLAG_REQ, .help = N_("maximum tolerable downtime (in milliseconds) for migration") }, @@ -11308,6 +11412,8 @@ static const vshCmdOptDef opts_migrate_setspeed[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "bandwidth", .type = VSH_OT_INT, + .required = true, + .positional = true, .flags = VSH_OFLAG_REQ, .help = N_("migration bandwidth limit in MiB/s") }, @@ -11897,6 +12003,8 @@ static const vshCmdOptDef opts_detach_device_alias[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "alias", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainDeviceAliasCompleter, .help = N_("device alias") @@ -12025,6 +12133,8 @@ static const vshCmdOptDef opts_detach_interface[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "type", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("network interface type") }, @@ -12397,6 +12507,8 @@ static const vshCmdOptDef opts_detach_disk[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "target", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("target of disk device") @@ -12557,6 +12669,8 @@ static const vshCmdOptDef opts_change_media[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "path", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("Fully-qualified path or target of disk device") @@ -13031,6 +13145,8 @@ static const vshCmdOptDef opts_get_user_sshkeys[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "user", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("user to list authorized keys for"), }, @@ -13078,6 +13194,8 @@ static const vshCmdOptDef opts_set_user_sshkeys[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "user", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("user to set authorized keys for"), }, diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 1a97f4926b..368e656550 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -468,12 +468,16 @@ static const vshCmdInfo info_allocpages = { static const vshCmdOptDef opts_allocpages[] = { {.name = "pagesize", .type = VSH_OT_INT, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshAllocpagesPagesizeCompleter, .help = N_("page size (in kibibytes)") }, {.name = "pagecount", .type = VSH_OT_INT, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("page count") }, @@ -943,6 +947,8 @@ static const vshCmdInfo info_nodesuspend = { static const vshCmdOptDef opts_node_suspend[] = { {.name = "target", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshNodeSuspendTargetCompleter, .help = N_("mem(Suspend-to-RAM), disk(Suspend-to-Disk), " @@ -950,6 +956,8 @@ static const vshCmdOptDef opts_node_suspend[] = { }, {.name = "duration", .type = VSH_OT_INT, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("Suspend duration in seconds, at least 60") }, @@ -1270,6 +1278,8 @@ static const vshCmdInfo info_cpu_models = { static const vshCmdOptDef opts_cpu_models[] = { {.name = "arch", .type = VSH_OT_DATA, + .positional = true, + .required = true, .completer = virshArchCompleter, .flags = VSH_OFLAG_REQ, .help = N_("architecture") diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 5dde4f9d46..52dce97462 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -21,6 +21,8 @@ #define VIRSH_COMMON_OPT_INTERFACE(cflags) \ {.name = "interface", \ .type = VSH_OT_DATA, \ + .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .help = N_("interface name or MAC address"), \ .completer = virshInterfaceNameCompleter, \ @@ -383,6 +385,8 @@ static const vshCmdInfo info_interface_name = { static const vshCmdOptDef opts_interface_name[] = { {.name = "interface", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshInterfaceMacCompleter, .help = N_("interface mac") @@ -414,6 +418,8 @@ static const vshCmdInfo info_interface_mac = { static const vshCmdOptDef opts_interface_mac[] = { {.name = "interface", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshInterfaceNameCompleter, .help = N_("interface name") @@ -716,12 +722,16 @@ static const vshCmdInfo info_interface_bridge = { static const vshCmdOptDef opts_interface_bridge[] = { {.name = "interface", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshInterfaceNameCompleter, .help = N_("existing interface name") }, {.name = "bridge", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("new bridge device name") }, @@ -943,6 +953,8 @@ static const vshCmdInfo info_interface_unbridge = { static const vshCmdOptDef opts_interface_unbridge[] = { {.name = "bridge", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("current bridge device name") }, diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 6f4a66b659..b9db3e061d 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -32,7 +32,9 @@ #define VIRSH_COMMON_OPT_NETWORK(_helpstr, cflags) \ {.name = "network", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_DATA,\ + .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshNetworkNameCompleter, \ @@ -56,6 +58,8 @@ #define VIRSH_COMMON_OPT_NETWORK_PORT(cflags) \ {.name = "port", \ .type = VSH_OT_DATA, \ + .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .help = N_("port UUID"), \ .completer = virshNetworkPortUUIDCompleter, \ @@ -520,6 +524,8 @@ static const vshCmdOptDef opts_network_metadata[] = { VIRSH_COMMON_OPT_NETWORK_FULL(0), {.name = "uri", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("URI of the namespace") }, @@ -1145,6 +1151,8 @@ static const vshCmdInfo info_network_name = { static const vshCmdOptDef opts_network_name[] = { {.name = "network", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshNetworkUUIDCompleter, .help = N_("network uuid") @@ -1242,18 +1250,24 @@ static const vshCmdOptDef opts_network_update[] = { VIRSH_COMMON_OPT_NETWORK_FULL(0), {.name = "command", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshNetworkUpdateCommandCompleter, .help = N_("type of update (add-first, add-last (add), delete, or modify)") }, {.name = "section", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshNetworkUpdateSectionCompleter, .help = N_("which section of network configuration to update") }, {.name = "xml", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompletePathLocalExisting, .help = N_("name of file containing xml (or, if it starts with '<', the complete " diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index c0fb319fa7..0081e3cbb7 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -97,6 +97,8 @@ static const vshCmdOptDef opts_node_device_destroy[] = { }, {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, @@ -571,6 +573,8 @@ static const vshCmdInfo info_node_device_dumpxml = { static const vshCmdOptDef opts_node_device_dumpxml[] = { {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, @@ -634,6 +638,8 @@ static const vshCmdInfo info_node_device_detach = { static const vshCmdOptDef opts_node_device_detach[] = { {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("device key"), .completer = virshNodeDeviceNameCompleter, @@ -696,6 +702,8 @@ static const vshCmdInfo info_node_device_reattach = { static const vshCmdOptDef opts_node_device_reattach[] = { {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("device key"), .completer = virshNodeDeviceNameCompleter, @@ -741,6 +749,8 @@ static const vshCmdInfo info_node_device_reset = { static const vshCmdOptDef opts_node_device_reset[] = { {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("device key"), .completer = virshNodeDeviceNameCompleter, @@ -1002,6 +1012,8 @@ static const vshCmdInfo info_node_device_undefine = { static const vshCmdOptDef opts_node_device_undefine[] = { {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, @@ -1093,6 +1105,8 @@ static const vshCmdInfo info_node_device_start = { static const vshCmdOptDef opts_node_device_start[] = { {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("device name"), .completer = virshNodeDeviceNameCompleter, @@ -1138,6 +1152,8 @@ static const vshCmdInfo info_node_device_autostart = { static const vshCmdOptDef opts_node_device_autostart[] = { {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, @@ -1195,6 +1211,8 @@ static const vshCmdInfo info_node_device_info = { static const vshCmdOptDef opts_node_device_info[] = { {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, @@ -1245,6 +1263,8 @@ static const vshCmdInfo info_node_device_update = { static const vshCmdOptDef opts_node_device_update[] = { {.name = "device", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 7a578f3f7c..993539d368 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -129,6 +129,8 @@ static const vshCmdInfo info_nwfilter_undefine = { static const vshCmdOptDef opts_nwfilter_undefine[] = { {.name = "nwfilter", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("network filter name or uuid"), .completer = virshNWFilterNameCompleter, @@ -167,6 +169,8 @@ static const vshCmdInfo info_nwfilter_dumpxml = { static const vshCmdOptDef opts_nwfilter_dumpxml[] = { {.name = "nwfilter", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("network filter name or uuid"), .completer = virshNWFilterNameCompleter, @@ -391,6 +395,8 @@ static const vshCmdInfo info_nwfilter_edit = { static const vshCmdOptDef opts_nwfilter_edit[] = { {.name = "nwfilter", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("network filter name or uuid"), .completer = virshNWFilterNameCompleter, @@ -526,6 +532,8 @@ static const vshCmdInfo info_nwfilter_binding_delete = { static const vshCmdOptDef opts_nwfilter_binding_delete[] = { {.name = "binding", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("network filter binding port dev"), .completer = virshNWFilterBindingNameCompleter, @@ -566,6 +574,8 @@ static const vshCmdInfo info_nwfilter_binding_dumpxml = { static const vshCmdOptDef opts_nwfilter_binding_dumpxml[] = { {.name = "binding", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("network filter binding portdev"), .completer = virshNWFilterBindingNameCompleter, diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index a7b82de9be..4606990836 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -58,12 +58,16 @@ #define VIRSH_COMMON_OPT_POOL_X_AS \ {.name = "name", \ .type = VSH_OT_DATA, \ + .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .completer = virshCompleteEmpty, \ .help = N_("name of the pool") \ }, \ {.name = "type", \ .type = VSH_OT_DATA, \ + .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .completer = virshPoolTypeCompleter, \ .help = N_("type of the pool") \ @@ -1354,6 +1358,8 @@ static const vshCmdInfo info_find_storage_pool_sources_as = { static const vshCmdOptDef opts_find_storage_pool_sources_as[] = { {.name = "type", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshPoolTypeCompleter, .help = N_("type of storage pool sources to find") @@ -1437,6 +1443,8 @@ static const vshCmdInfo info_find_storage_pool_sources = { static const vshCmdOptDef opts_find_storage_pool_sources[] = { {.name = "type", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshPoolTypeCompleter, .help = N_("type of storage pool sources to discover") diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index a88980ef9e..d7e60de4ca 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -124,6 +124,8 @@ static const vshCmdInfo info_secret_dumpxml = { static const vshCmdOptDef opts_secret_dumpxml[] = { {.name = "secret", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("secret UUID"), .completer = virshSecretUUIDCompleter, @@ -179,6 +181,8 @@ static const vshCmdInfo info_secret_set_value = { static const vshCmdOptDef opts_secret_set_value[] = { {.name = "secret", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("secret UUID"), .completer = virshSecretUUIDCompleter, @@ -290,6 +294,8 @@ static const vshCmdInfo info_secret_get_value = { static const vshCmdOptDef opts_secret_get_value[] = { {.name = "secret", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("secret UUID"), .completer = virshSecretUUIDCompleter, @@ -343,6 +349,8 @@ static const vshCmdInfo info_secret_undefine = { static const vshCmdOptDef opts_secret_undefine[] = { {.name = "secret", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("secret UUID"), .completer = virshSecretUUIDCompleter, diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 31ab27b112..9ad33c4252 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1568,6 +1568,8 @@ static const vshCmdOptDef opts_snapshot_dumpxml[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT), {.name = "snapshotname", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("snapshot name"), .completer = virshSnapshotNameCompleter, diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 0cb7262b67..ecf89345c3 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -57,6 +57,8 @@ #define VIRSH_COMMON_OPT_VOL_NAME(_helpstr) \ {.name = "vol", \ .type = VSH_OT_DATA, \ + .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshStorageVolNameCompleter, \ @@ -65,6 +67,8 @@ #define VIRSH_COMMON_OPT_VOL_KEY(_helpstr) \ {.name = "vol", \ .type = VSH_OT_DATA, \ + .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshStorageVolKeyCompleter, \ @@ -173,12 +177,16 @@ static const vshCmdOptDef opts_vol_create_as[] = { VIRSH_COMMON_OPT_POOL_NAME, {.name = "name", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("name of the volume") }, {.name = "capacity", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("size of the vol, as scaled integer (default bytes)") @@ -520,6 +528,8 @@ static const vshCmdOptDef opts_vol_clone[] = { VIRSH_COMMON_OPT_VOL_FULL, {.name = "newname", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("clone name") @@ -1024,6 +1034,8 @@ static const vshCmdOptDef opts_vol_resize[] = { VIRSH_COMMON_OPT_VOL_FULL, {.name = "capacity", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("new capacity for the vol, as scaled integer (default bytes)") diff --git a/tools/virsh.h b/tools/virsh.h index 877b290e3a..3e8d998a5d 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -57,7 +57,9 @@ */ #define VIRSH_COMMON_OPT_POOL(_helpstr, cflags) \ {.name = "pool", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_DATA,\ + .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshStoragePoolNameCompleter, \ @@ -66,7 +68,9 @@ #define VIRSH_COMMON_OPT_DOMAIN(_helpstr, cflags) \ {.name = "domain", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_DATA,\ + .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshDomainNameCompleter, \ @@ -98,10 +102,12 @@ #define VIRSH_COMMON_OPT_FILE(_helpstr) \ VIRSH_COMMON_OPT_FILE_FULL(_helpstr, true) -#define VIRSH_COMMON_OPT_FILE_FULL(_helpstr, required) \ +#define VIRSH_COMMON_OPT_FILE_FULL(_helpstr, required_) \ {.name = "file", \ - .type = required ? VSH_OT_DATA : VSH_OT_STRING, \ - .flags = required ? VSH_OFLAG_REQ : VSH_OFLAG_NONE, \ + .type = required_ ? VSH_OT_DATA : VSH_OT_STRING, \ + .required = required_, \ + .positional = required_, \ + .flags = required_ ? VSH_OFLAG_REQ : VSH_OFLAG_NONE, \ .completer = virshCompletePathLocalExisting, \ .help = _helpstr \ } diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 114ec2e8e7..d266d824cb 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -359,6 +359,8 @@ static const vshCmdInfo info_srv_threadpool_info = { static const vshCmdOptDef opts_srv_threadpool_info[] = { {.name = "server", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("Server to retrieve threadpool attributes from."), @@ -416,6 +418,8 @@ static const vshCmdInfo info_srv_threadpool_set = { static const vshCmdOptDef opts_srv_threadpool_set[] = { {.name = "server", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("Server to alter threadpool attributes on."), @@ -517,6 +521,8 @@ static const vshCmdInfo info_srv_clients_list = { static const vshCmdOptDef opts_srv_clients_list[] = { {.name = "server", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("server which to list connected clients from"), @@ -599,12 +605,16 @@ static const vshCmdInfo info_client_info = { static const vshCmdOptDef opts_client_info[] = { {.name = "server", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("server to which <client> is connected to"), }, {.name = "client", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("client which to retrieve identity information for"), }, @@ -681,12 +691,16 @@ static const vshCmdInfo info_client_disconnect = { static const vshCmdOptDef opts_client_disconnect[] = { {.name = "server", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("server which the client is currently connected to"), }, {.name = "client", .type = VSH_OT_INT, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("client which to disconnect, specified by ID"), }, @@ -742,6 +756,8 @@ static const vshCmdInfo info_srv_clients_info = { static const vshCmdOptDef opts_srv_clients_info[] = { {.name = "server", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("Server to retrieve the client limits from."), @@ -796,6 +812,8 @@ static const vshCmdInfo info_srv_clients_set = { static const vshCmdOptDef opts_srv_clients_set[] = { {.name = "server", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("Server to alter the client-related configuration limits on."), @@ -893,6 +911,8 @@ static const vshCmdInfo info_srv_update_tls_file = { static const vshCmdOptDef opts_srv_update_tls_file[] = { {.name = "server", .type = VSH_OT_DATA, + .positional = true, + .required = true, .flags = VSH_OFLAG_REQ, .help = N_("Available servers on a daemon. " "Currently only supports 'libvirtd' or 'virtproxyd'.") @@ -991,6 +1011,8 @@ static const vshCmdInfo info_daemon_log_outputs = { static const vshCmdOptDef opts_daemon_timeout[] = { {.name = "timeout", .type = VSH_OT_INT, + .positional = true, + .required = true, .help = N_("number of seconds the daemon will run without any active connection"), .flags = VSH_OFLAG_REQ | VSH_OFLAG_REQ_OPT }, diff --git a/tools/vsh.c b/tools/vsh.c index de68f93a1f..9745c122fe 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -248,6 +248,7 @@ vshCmddefCheckInternals(vshControl *ctl, { size_t i; bool seenOptionalOption = false; + bool seenPositionalOption = false; g_auto(virBuffer) complbuf = VIR_BUFFER_INITIALIZER; /* in order to perform the validation resolve the alias first */ @@ -301,6 +302,8 @@ vshCmddefCheckInternals(vshControl *ctl, for (i = 0; cmd->opts[i].name; i++) { const vshCmdOptDef *opt = &cmd->opts[i]; + bool isPositional = false; + bool isRequired = false; if (i > 63) { vshError(ctl, "command '%s' has too many options", cmd->name); @@ -385,12 +388,17 @@ vshCmddefCheckInternals(vshControl *ctl, } } break; + case VSH_OT_ARGV: if (cmd->opts[i + 1].name) { vshError(ctl, "parameter '%s' of command '%s' must be listed last", opt->name, cmd->name); return -1; } + + isRequired = opt->flags & VSH_OFLAG_REQ; + /* ARGV argument is positional if there are no positional options */ + isPositional = !seenPositionalOption; break; case VSH_OT_DATA: @@ -400,6 +408,10 @@ vshCmddefCheckInternals(vshControl *ctl, return -1; } + isRequired = true; + isPositional = true; + seenPositionalOption = true; + if (seenOptionalOption) { vshError(ctl, "parameter '%s' of command '%s' must be listed before optional parameters", opt->name, cmd->name); @@ -414,12 +426,28 @@ vshCmddefCheckInternals(vshControl *ctl, opt->name, cmd->name); return -1; } + seenPositionalOption = true; + isPositional = true; + isRequired = true; } else { - seenOptionalOption = true; + isPositional = false; + isRequired = false; } break; } + + if (opt->required != isRequired) { + vshError(ctl, "parameter '%s' of command '%s' 'required' state mismatch", + opt->name, cmd->name); + return -1; + } + + if (opt->positional != isPositional) { + vshError(ctl, "parameter '%s' of command '%s' 'positional' state mismatch", + opt->name, cmd->name); + return -1; + } } virBufferTrim(&complbuf, ", "); @@ -3202,6 +3230,7 @@ const vshCmdOptDef opts_echo[] = { }, {.name = "string", .type = VSH_OT_ARGV, + .positional = true, .help = N_("arguments to echo") }, {.name = NULL} @@ -3340,6 +3369,7 @@ cmdSelfTest(vshControl *ctl, const vshCmd *cmd) const vshCmdOptDef opts_complete[] = { {.name = "string", .type = VSH_OT_ARGV, + .positional = true, .flags = VSH_OFLAG_EMPTY_OK, .help = N_("partial string to autocomplete") }, diff --git a/tools/vsh.h b/tools/vsh.h index c8015b8dd7..d2591e93a6 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -133,6 +133,8 @@ struct _vshCmdInfo { struct _vshCmdOptDef { const char *name; /* the name of option, or NULL for list end */ vshCmdOptType type; /* option type */ + bool required; /* option is required */ + bool positional; /* option is a positional option (not requiring '--optionname') */ unsigned int flags; /* flags */ const char *help; /* non-NULL help string; or for VSH_OT_ALIAS * the name of a later public option */ -- 2.44.0
On a Monday in 2024, Peter Krempa wrote:
Add 'positional' and 'required' fields to vshCmdOptDef, which will explicitly track the two properties of arguments.
To ensure that we have proper coverage, add checks to vshCmddefCheckInternals validating the state of the above flags by infering it from existing data.
This conversion will allow us: - remove VSH_OT_DATA in favor of VSH_OT_STRING - use VSH_OT_INT when required both as positional and non-positional - properly annotate which VSH_OT_ARGV are positional and which are not (currently inferred by whether an previous positional option exists)
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh-domain-monitor.c | 5 ++ tools/virsh-domain.c | 118 +++++++++++++++++++++++++++++++++++ tools/virsh-host.c | 10 +++ tools/virsh-interface.c | 12 ++++ tools/virsh-network.c | 16 ++++- tools/virsh-nodedev.c | 20 ++++++ tools/virsh-nwfilter.c | 10 +++ tools/virsh-pool.c | 8 +++ tools/virsh-secret.c | 8 +++ tools/virsh-snapshot.c | 2 + tools/virsh-volume.c | 12 ++++ tools/virsh.h | 16 +++-- tools/virt-admin.c | 22 +++++++ tools/vsh.c | 32 +++++++++- tools/vsh.h | 2 + 15 files changed, 286 insertions(+), 7 deletions(-)
diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 6f4a66b659..b9db3e061d 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -32,7 +32,9 @@
#define VIRSH_COMMON_OPT_NETWORK(_helpstr, cflags) \ {.name = "network", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_DATA,\
Unrelated whitespace change.
+ .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshNetworkNameCompleter, \ diff --git a/tools/virsh.h b/tools/virsh.h index 877b290e3a..3e8d998a5d 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -57,7 +57,9 @@ */ #define VIRSH_COMMON_OPT_POOL(_helpstr, cflags) \ {.name = "pool", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_DATA,\
Same here.
+ .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshStoragePoolNameCompleter, \ @@ -66,7 +68,9 @@
#define VIRSH_COMMON_OPT_DOMAIN(_helpstr, cflags) \ {.name = "domain", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_DATA,\
And here.
+ .positional = true, \ + .required = true, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshDomainNameCompleter, \
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
In at least one case we've wanted a mandatory argument which requires the explicit flag. Fix the assumption before converting everything over to the new flags. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virt-admin.c | 1 - tools/vsh.c | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index d266d824cb..2e8895956d 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1011,7 +1011,6 @@ static const vshCmdInfo info_daemon_log_outputs = { static const vshCmdOptDef opts_daemon_timeout[] = { {.name = "timeout", .type = VSH_OT_INT, - .positional = true, .required = true, .help = N_("number of seconds the daemon will run without any active connection"), .flags = VSH_OFLAG_REQ | VSH_OFLAG_REQ_OPT diff --git a/tools/vsh.c b/tools/vsh.c index 9745c122fe..7091cf093c 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -426,9 +426,14 @@ vshCmddefCheckInternals(vshControl *ctl, opt->name, cmd->name); return -1; } - seenPositionalOption = true; - isPositional = true; + isRequired = true; + + /* allow INT arguments which are required and non-positional */ + if (!(opt->flags & VSH_OFLAG_REQ_OPT)) { + seenPositionalOption = true; + isPositional = true; + } } else { isPositional = false; isRequired = false; -- 2.44.0
This is logically enforced by existing checks, thus we can formalize it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/vsh.c b/tools/vsh.c index 7091cf093c..301fa9d747 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -329,6 +329,13 @@ vshCmddefCheckInternals(vshControl *ctl, } } + /* require that positional non-argv options are required */ + if (opt->positional && !opt->required && opt->type != VSH_OT_ARGV) { + vshError(ctl, "positional argument '%s' of command '%s' must be required", + opt->name, cmd->name); + return -1; + } + switch (opt->type) { case VSH_OT_NONE: vshError(ctl, "invalid type 'NONE' of option '%s' of command '%s'", -- 2.44.0
Now that the code was refactored and proved identical, remove the checks so that they don't impede further refactors. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 301fa9d747..3245e64f5e 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -248,7 +248,6 @@ vshCmddefCheckInternals(vshControl *ctl, { size_t i; bool seenOptionalOption = false; - bool seenPositionalOption = false; g_auto(virBuffer) complbuf = VIR_BUFFER_INITIALIZER; /* in order to perform the validation resolve the alias first */ @@ -302,8 +301,6 @@ vshCmddefCheckInternals(vshControl *ctl, for (i = 0; cmd->opts[i].name; i++) { const vshCmdOptDef *opt = &cmd->opts[i]; - bool isPositional = false; - bool isRequired = false; if (i > 63) { vshError(ctl, "command '%s' has too many options", cmd->name); @@ -402,10 +399,6 @@ vshCmddefCheckInternals(vshControl *ctl, opt->name, cmd->name); return -1; } - - isRequired = opt->flags & VSH_OFLAG_REQ; - /* ARGV argument is positional if there are no positional options */ - isPositional = !seenPositionalOption; break; case VSH_OT_DATA: @@ -415,10 +408,6 @@ vshCmddefCheckInternals(vshControl *ctl, return -1; } - isRequired = true; - isPositional = true; - seenPositionalOption = true; - if (seenOptionalOption) { vshError(ctl, "parameter '%s' of command '%s' must be listed before optional parameters", opt->name, cmd->name); @@ -433,33 +422,10 @@ vshCmddefCheckInternals(vshControl *ctl, opt->name, cmd->name); return -1; } - - isRequired = true; - - /* allow INT arguments which are required and non-positional */ - if (!(opt->flags & VSH_OFLAG_REQ_OPT)) { - seenPositionalOption = true; - isPositional = true; - } - } else { - isPositional = false; - isRequired = false; } break; } - - if (opt->required != isRequired) { - vshError(ctl, "parameter '%s' of command '%s' 'required' state mismatch", - opt->name, cmd->name); - return -1; - } - - if (opt->positional != isPositional) { - vshError(ctl, "parameter '%s' of command '%s' 'positional' state mismatch", - opt->name, cmd->name); - return -1; - } } virBufferTrim(&complbuf, ", "); -- 2.44.0
Use the new properties rather than infer the states. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 3245e64f5e..521f222910 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -634,8 +634,6 @@ vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp) static bool vshCmddefHelp(const vshCmdDef *def) { - bool shortopt = false; /* true if 'arg' works instead of '--opt arg' */ - fputs(_(" NAME\n"), stdout); fprintf(stdout, " %s - %s\n", def->name, _(def->info->help)); @@ -657,16 +655,10 @@ vshCmddefHelp(const vshCmdDef *def) } else { fprintf(stdout, _(" [--%1$s <number>]"), opt->name); } - - if (!(opt->flags & VSH_OFLAG_REQ_OPT)) - shortopt = true; break; case VSH_OT_STRING: fprintf(stdout, _(" [--%1$s <string>]"), opt->name); - - if (!(opt->flags & VSH_OFLAG_REQ_OPT)) - shortopt = true; break; case VSH_OT_DATA: @@ -675,23 +667,20 @@ vshCmddefHelp(const vshCmdDef *def) } else { fprintf(stdout, " [<%s>]", opt->name); } - - if (!(opt->flags & VSH_OFLAG_REQ_OPT)) - shortopt = true; break; case VSH_OT_ARGV: - if (shortopt) { - if (required_option) { - fprintf(stdout, _(" {[--%1$s] <string>}..."), opt->name); + if (opt->positional) { + if (opt->required) { + fprintf(stdout, " <%s>...", opt->name); } else { - fprintf(stdout, _(" [[--%1$s] <string>]..."), opt->name); + fprintf(stdout, " [<%s>]...", opt->name); } } else { - if (required_option) { - fprintf(stdout, " <%s>...", opt->name); + if (opt->required) { + fprintf(stdout, _(" {[--%1$s] <string>}..."), opt->name); } else { - fprintf(stdout, " [<%s>]...", opt->name); + fprintf(stdout, _(" [[--%1$s] <string>]..."), opt->name); } } break; @@ -740,10 +729,10 @@ vshCmddefHelp(const vshCmdDef *def) break; case VSH_OT_ARGV: - if (shortopt) { - optstr = g_strdup_printf(_("[--%1$s] <string>"), opt->name); - } else { + if (opt->positional) { optstr = g_strdup_printf("<%s>", opt->name); + } else { + optstr = g_strdup_printf(_("[--%1$s] <string>"), opt->name); } break; -- 2.44.0
Use the new 'positional' field to do decisions rather than have a special type for positional strings. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh-domain-monitor.c | 4 +- tools/virsh-domain.c | 94 ++++++++++++++++++------------------ tools/virsh-host.c | 4 +- tools/virsh-interface.c | 12 ++--- tools/virsh-network.c | 14 +++--- tools/virsh-nodedev.c | 20 ++++---- tools/virsh-nwfilter.c | 10 ++-- tools/virsh-pool.c | 8 +-- tools/virsh-secret.c | 8 +-- tools/virsh-snapshot.c | 2 +- tools/virsh-volume.c | 12 ++--- tools/virsh.h | 6 +-- tools/virt-admin.c | 18 +++---- tools/vsh.c | 33 +++---------- tools/vsh.h | 1 - 15 files changed, 112 insertions(+), 134 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 573451c678..568ff770a1 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -737,7 +737,7 @@ static const vshCmdInfo info_domif_getlink = { static const vshCmdOptDef opts_domif_getlink[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "interface", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1039,7 +1039,7 @@ static const vshCmdInfo info_domifstat = { static const vshCmdOptDef opts_domifstat[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "interface", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7a63757131..1dbef9a7a6 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -419,14 +419,14 @@ static const vshCmdInfo info_attach_disk = { static const vshCmdOptDef opts_attach_disk[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "source", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ | VSH_OFLAG_EMPTY_OK, .help = N_("source of disk device or name of network disk") }, {.name = "target", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -815,14 +815,14 @@ static const vshCmdInfo info_attach_interface = { static const vshCmdOptDef opts_attach_interface[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "type", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, .help = N_("network interface type") }, {.name = "source", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1195,7 +1195,7 @@ static const vshCmdInfo info_blkdeviotune = { static const vshCmdOptDef opts_blkdeviotune[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1990,7 +1990,7 @@ static const vshCmdInfo info_blockcommit = { static const vshCmdOptDef opts_blockcommit[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "path", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -2211,7 +2211,7 @@ static const vshCmdInfo info_blockcopy = { static const vshCmdOptDef opts_blockcopy[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "path", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -2545,7 +2545,7 @@ static const vshCmdInfo info_blockjob = { static const vshCmdOptDef opts_blockjob[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "path", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -2758,7 +2758,7 @@ static const vshCmdInfo info_blockpull = { static const vshCmdOptDef opts_blockpull[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "path", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -2902,7 +2902,7 @@ static const vshCmdInfo info_blockresize = { static const vshCmdOptDef opts_blockresize[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "path", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -3061,7 +3061,7 @@ static const vshCmdInfo info_domif_setlink = { static const vshCmdOptDef opts_domif_setlink[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "interface", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -3069,7 +3069,7 @@ static const vshCmdOptDef opts_domif_setlink[] = { .help = N_("interface device (MAC Address)") }, {.name = "state", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -3211,7 +3211,7 @@ static const vshCmdInfo info_domiftune = { static const vshCmdOptDef opts_domiftune[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "interface", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -3438,7 +3438,7 @@ static const vshCmdInfo info_dom_pm_suspend = { static const vshCmdOptDef opts_dom_pm_suspend[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_RUNNING), {.name = "target", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -4123,7 +4123,7 @@ static const vshCmdInfo info_save = { static const vshCmdOptDef opts_save[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "file", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -4474,7 +4474,7 @@ static const vshCmdInfo info_save_image_dumpxml = { static const vshCmdOptDef opts_save_image_dumpxml[] = { {.name = "file", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -4533,14 +4533,14 @@ static const vshCmdInfo info_save_image_define = { static const vshCmdOptDef opts_save_image_define[] = { {.name = "file", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, .help = N_("saved state file to modify") }, {.name = "xml", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -4600,7 +4600,7 @@ static const vshCmdInfo info_save_image_edit = { static const vshCmdOptDef opts_save_image_edit[] = { {.name = "file", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -4941,7 +4941,7 @@ static const vshCmdInfo info_managed_save_define = { static const vshCmdOptDef opts_managed_save_define[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE), {.name = "xml", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -5219,7 +5219,7 @@ static const vshCmdInfo info_restore = { static const vshCmdOptDef opts_restore[] = { {.name = "file", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -5304,7 +5304,7 @@ static const vshCmdInfo info_dump = { static const vshCmdOptDef opts_dump[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "file", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -5605,7 +5605,7 @@ static const vshCmdInfo info_setLifecycleAction = { static const vshCmdOptDef opts_setLifecycleAction[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "type", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -5613,7 +5613,7 @@ static const vshCmdOptDef opts_setLifecycleAction[] = { .help = N_("lifecycle type to modify") }, {.name = "action", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -5701,14 +5701,14 @@ static const vshCmdInfo info_set_user_password = { static const vshCmdOptDef opts_set_user_password[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "user", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, .help = N_("the username") }, {.name = "password", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -7293,7 +7293,7 @@ static const vshCmdInfo info_setvcpu = { static const vshCmdOptDef opts_setvcpu[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "vcpulist", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -7369,7 +7369,7 @@ static const vshCmdInfo info_domblkthreshold = { static const vshCmdOptDef opts_domblkthreshold[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "dev", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -7509,7 +7509,7 @@ static const vshCmdOptDef opts_iothreadpin[] = { .help = N_("IOThread ID number") }, {.name = "cpulist", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -8365,7 +8365,7 @@ static const vshCmdInfo info_metadata = { static const vshCmdOptDef opts_metadata[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "uri", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -8630,7 +8630,7 @@ static const vshCmdInfo info_send_process_signal = { static const vshCmdOptDef opts_send_process_signal[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "pid", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -8638,7 +8638,7 @@ static const vshCmdOptDef opts_send_process_signal[] = { .help = N_("the process ID") }, {.name = "signame", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -9574,7 +9574,7 @@ static const vshCmdInfo info_dom_fd_associate = { static const vshCmdOptDef opts_dom_fd_associate[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "name", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -9582,7 +9582,7 @@ static const vshCmdOptDef opts_dom_fd_associate[] = { .help = N_("name of the FD group") }, {.name = "pass-fds", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -9996,7 +9996,7 @@ static const vshCmdInfo info_qemu_attach = { static const vshCmdOptDef opts_qemu_attach[] = { {.name = "pid", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -10332,14 +10332,14 @@ static const vshCmdInfo info_domxmlfromnative = { static const vshCmdOptDef opts_domxmlfromnative[] = { {.name = "format", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, .help = N_("source config data format") }, {.name = "config", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -10384,7 +10384,7 @@ static const vshCmdInfo info_domxmltonative = { static const vshCmdOptDef opts_domxmltonative[] = { {.name = "format", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -10453,7 +10453,7 @@ static const vshCmdInfo info_domname = { static const vshCmdOptDef opts_domname[] = { {.name = "domain", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -10488,7 +10488,7 @@ static const vshCmdOptDef opts_domrename[] = { VIRSH_COMMON_OPT_DOMAIN(N_("domain name or uuid"), VIR_CONNECT_LIST_DOMAINS_INACTIVE), {.name = "new-name", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -10592,7 +10592,7 @@ static const vshCmdInfo info_migrate = { static const vshCmdOptDef opts_migrate[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "desturi", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -12002,7 +12002,7 @@ static const vshCmdInfo info_detach_device_alias = { static const vshCmdOptDef opts_detach_device_alias[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "alias", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -12132,7 +12132,7 @@ static const vshCmdInfo info_detach_interface = { static const vshCmdOptDef opts_detach_interface[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "type", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -12506,7 +12506,7 @@ static const vshCmdInfo info_detach_disk = { static const vshCmdOptDef opts_detach_disk[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "target", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -12668,7 +12668,7 @@ static const vshCmdInfo info_change_media = { static const vshCmdOptDef opts_change_media[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "path", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -13144,7 +13144,7 @@ static const vshCmdInfo info_get_user_sshkeys = { static const vshCmdOptDef opts_get_user_sshkeys[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "user", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -13193,7 +13193,7 @@ static const vshCmdInfo info_set_user_sshkeys = { static const vshCmdOptDef opts_set_user_sshkeys[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "user", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 368e656550..97de6f8bed 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -946,7 +946,7 @@ static const vshCmdInfo info_nodesuspend = { static const vshCmdOptDef opts_node_suspend[] = { {.name = "target", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1277,7 +1277,7 @@ static const vshCmdInfo info_cpu_models = { static const vshCmdOptDef opts_cpu_models[] = { {.name = "arch", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .completer = virshArchCompleter, diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 52dce97462..109378ca71 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -20,7 +20,7 @@ #define VIRSH_COMMON_OPT_INTERFACE(cflags) \ {.name = "interface", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ .flags = VSH_OFLAG_REQ, \ @@ -384,7 +384,7 @@ static const vshCmdInfo info_interface_name = { static const vshCmdOptDef opts_interface_name[] = { {.name = "interface", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -417,7 +417,7 @@ static const vshCmdInfo info_interface_mac = { static const vshCmdOptDef opts_interface_mac[] = { {.name = "interface", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -721,7 +721,7 @@ static const vshCmdInfo info_interface_bridge = { static const vshCmdOptDef opts_interface_bridge[] = { {.name = "interface", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -729,7 +729,7 @@ static const vshCmdOptDef opts_interface_bridge[] = { .help = N_("existing interface name") }, {.name = "bridge", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -952,7 +952,7 @@ static const vshCmdInfo info_interface_unbridge = { static const vshCmdOptDef opts_interface_unbridge[] = { {.name = "bridge", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/virsh-network.c b/tools/virsh-network.c index b9db3e061d..edbcebd682 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -32,7 +32,7 @@ #define VIRSH_COMMON_OPT_NETWORK(_helpstr, cflags) \ {.name = "network", \ - .type = VSH_OT_DATA,\ + .type = VSH_OT_STRING,\ .positional = true, \ .required = true, \ .flags = VSH_OFLAG_REQ, \ @@ -57,7 +57,7 @@ #define VIRSH_COMMON_OPT_NETWORK_PORT(cflags) \ {.name = "port", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ .flags = VSH_OFLAG_REQ, \ @@ -523,7 +523,7 @@ static const vshCmdInfo info_network_metadata = { static const vshCmdOptDef opts_network_metadata[] = { VIRSH_COMMON_OPT_NETWORK_FULL(0), {.name = "uri", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1150,7 +1150,7 @@ static const vshCmdInfo info_network_name = { static const vshCmdOptDef opts_network_name[] = { {.name = "network", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1249,7 +1249,7 @@ static const vshCmdInfo info_network_update = { static const vshCmdOptDef opts_network_update[] = { VIRSH_COMMON_OPT_NETWORK_FULL(0), {.name = "command", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1257,7 +1257,7 @@ static const vshCmdOptDef opts_network_update[] = { .help = N_("type of update (add-first, add-last (add), delete, or modify)") }, {.name = "section", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1265,7 +1265,7 @@ static const vshCmdOptDef opts_network_update[] = { .help = N_("which section of network configuration to update") }, {.name = "xml", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 0081e3cbb7..7d63581436 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -96,7 +96,7 @@ static const vshCmdOptDef opts_node_device_destroy[] = { .help = "device" }, {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -572,7 +572,7 @@ static const vshCmdInfo info_node_device_dumpxml = { static const vshCmdOptDef opts_node_device_dumpxml[] = { {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -637,7 +637,7 @@ static const vshCmdInfo info_node_device_detach = { static const vshCmdOptDef opts_node_device_detach[] = { {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -701,7 +701,7 @@ static const vshCmdInfo info_node_device_reattach = { static const vshCmdOptDef opts_node_device_reattach[] = { {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -748,7 +748,7 @@ static const vshCmdInfo info_node_device_reset = { static const vshCmdOptDef opts_node_device_reset[] = { {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1011,7 +1011,7 @@ static const vshCmdInfo info_node_device_undefine = { static const vshCmdOptDef opts_node_device_undefine[] = { {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1104,7 +1104,7 @@ static const vshCmdInfo info_node_device_start = { static const vshCmdOptDef opts_node_device_start[] = { {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1151,7 +1151,7 @@ static const vshCmdInfo info_node_device_autostart = { static const vshCmdOptDef opts_node_device_autostart[] = { {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1210,7 +1210,7 @@ static const vshCmdInfo info_node_device_info = { static const vshCmdOptDef opts_node_device_info[] = { {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1262,7 +1262,7 @@ static const vshCmdInfo info_node_device_update = { static const vshCmdOptDef opts_node_device_update[] = { {.name = "device", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 993539d368..faa8e98130 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -128,7 +128,7 @@ static const vshCmdInfo info_nwfilter_undefine = { static const vshCmdOptDef opts_nwfilter_undefine[] = { {.name = "nwfilter", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -168,7 +168,7 @@ static const vshCmdInfo info_nwfilter_dumpxml = { static const vshCmdOptDef opts_nwfilter_dumpxml[] = { {.name = "nwfilter", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -394,7 +394,7 @@ static const vshCmdInfo info_nwfilter_edit = { static const vshCmdOptDef opts_nwfilter_edit[] = { {.name = "nwfilter", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -531,7 +531,7 @@ static const vshCmdInfo info_nwfilter_binding_delete = { static const vshCmdOptDef opts_nwfilter_binding_delete[] = { {.name = "binding", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -573,7 +573,7 @@ static const vshCmdInfo info_nwfilter_binding_dumpxml = { static const vshCmdOptDef opts_nwfilter_binding_dumpxml[] = { {.name = "binding", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 4606990836..8557e0d5e0 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -57,7 +57,7 @@ #define VIRSH_COMMON_OPT_POOL_X_AS \ {.name = "name", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ .flags = VSH_OFLAG_REQ, \ @@ -65,7 +65,7 @@ .help = N_("name of the pool") \ }, \ {.name = "type", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ .flags = VSH_OFLAG_REQ, \ @@ -1357,7 +1357,7 @@ static const vshCmdInfo info_find_storage_pool_sources_as = { static const vshCmdOptDef opts_find_storage_pool_sources_as[] = { {.name = "type", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1442,7 +1442,7 @@ static const vshCmdInfo info_find_storage_pool_sources = { static const vshCmdOptDef opts_find_storage_pool_sources[] = { {.name = "type", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index d7e60de4ca..0d0db9877b 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -123,7 +123,7 @@ static const vshCmdInfo info_secret_dumpxml = { static const vshCmdOptDef opts_secret_dumpxml[] = { {.name = "secret", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -180,7 +180,7 @@ static const vshCmdInfo info_secret_set_value = { static const vshCmdOptDef opts_secret_set_value[] = { {.name = "secret", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -293,7 +293,7 @@ static const vshCmdInfo info_secret_get_value = { static const vshCmdOptDef opts_secret_get_value[] = { {.name = "secret", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -348,7 +348,7 @@ static const vshCmdInfo info_secret_undefine = { static const vshCmdOptDef opts_secret_undefine[] = { {.name = "secret", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 9ad33c4252..9658fdefcd 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1567,7 +1567,7 @@ static const vshCmdInfo info_snapshot_dumpxml = { static const vshCmdOptDef opts_snapshot_dumpxml[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT), {.name = "snapshotname", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index ecf89345c3..90a450ad14 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -56,7 +56,7 @@ #define VIRSH_COMMON_OPT_VOL_NAME(_helpstr) \ {.name = "vol", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ .flags = VSH_OFLAG_REQ, \ @@ -66,7 +66,7 @@ #define VIRSH_COMMON_OPT_VOL_KEY(_helpstr) \ {.name = "vol", \ - .type = VSH_OT_DATA, \ + .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ .flags = VSH_OFLAG_REQ, \ @@ -176,7 +176,7 @@ static const vshCmdInfo info_vol_create_as = { static const vshCmdOptDef opts_vol_create_as[] = { VIRSH_COMMON_OPT_POOL_NAME, {.name = "name", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -184,7 +184,7 @@ static const vshCmdOptDef opts_vol_create_as[] = { .help = N_("name of the volume") }, {.name = "capacity", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -527,7 +527,7 @@ static const vshCmdInfo info_vol_clone = { static const vshCmdOptDef opts_vol_clone[] = { VIRSH_COMMON_OPT_VOL_FULL, {.name = "newname", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -1033,7 +1033,7 @@ static const vshCmdInfo info_vol_resize = { static const vshCmdOptDef opts_vol_resize[] = { VIRSH_COMMON_OPT_VOL_FULL, {.name = "capacity", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/virsh.h b/tools/virsh.h index 3e8d998a5d..b009ed5854 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -57,7 +57,7 @@ */ #define VIRSH_COMMON_OPT_POOL(_helpstr, cflags) \ {.name = "pool", \ - .type = VSH_OT_DATA,\ + .type = VSH_OT_STRING,\ .positional = true, \ .required = true, \ .flags = VSH_OFLAG_REQ, \ @@ -68,7 +68,7 @@ #define VIRSH_COMMON_OPT_DOMAIN(_helpstr, cflags) \ {.name = "domain", \ - .type = VSH_OT_DATA,\ + .type = VSH_OT_STRING,\ .positional = true, \ .required = true, \ .flags = VSH_OFLAG_REQ, \ @@ -104,7 +104,7 @@ #define VIRSH_COMMON_OPT_FILE_FULL(_helpstr, required_) \ {.name = "file", \ - .type = required_ ? VSH_OT_DATA : VSH_OT_STRING, \ + .type = VSH_OT_STRING, \ .required = required_, \ .positional = required_, \ .flags = required_ ? VSH_OFLAG_REQ : VSH_OFLAG_NONE, \ diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 2e8895956d..d119116124 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -358,7 +358,7 @@ static const vshCmdInfo info_srv_threadpool_info = { static const vshCmdOptDef opts_srv_threadpool_info[] = { {.name = "server", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -417,7 +417,7 @@ static const vshCmdInfo info_srv_threadpool_set = { static const vshCmdOptDef opts_srv_threadpool_set[] = { {.name = "server", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -520,7 +520,7 @@ static const vshCmdInfo info_srv_clients_list = { static const vshCmdOptDef opts_srv_clients_list[] = { {.name = "server", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -604,7 +604,7 @@ static const vshCmdInfo info_client_info = { static const vshCmdOptDef opts_client_info[] = { {.name = "server", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -612,7 +612,7 @@ static const vshCmdOptDef opts_client_info[] = { .help = N_("server to which <client> is connected to"), }, {.name = "client", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -690,7 +690,7 @@ static const vshCmdInfo info_client_disconnect = { static const vshCmdOptDef opts_client_disconnect[] = { {.name = "server", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -755,7 +755,7 @@ static const vshCmdInfo info_srv_clients_info = { static const vshCmdOptDef opts_srv_clients_info[] = { {.name = "server", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -811,7 +811,7 @@ static const vshCmdInfo info_srv_clients_set = { static const vshCmdOptDef opts_srv_clients_set[] = { {.name = "server", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, @@ -910,7 +910,7 @@ static const vshCmdInfo info_srv_update_tls_file = { static const vshCmdOptDef opts_srv_update_tls_file[] = { {.name = "server", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .positional = true, .required = true, .flags = VSH_OFLAG_REQ, diff --git a/tools/vsh.c b/tools/vsh.c index c7257586e3..7e8fbf8050 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -310,7 +310,6 @@ vshCmddefCheckInternals(vshControl *ctl, if (missingCompleters && !opt->completer) { switch (opt->type) { case VSH_OT_STRING: - case VSH_OT_DATA: case VSH_OT_ARGV: virBufferStrcat(&complbuf, opt->name, ", ", NULL); break; @@ -346,16 +345,12 @@ vshCmddefCheckInternals(vshControl *ctl, return -1; } - G_GNUC_FALLTHROUGH; - - case VSH_OT_STRING: if (opt->flags & VSH_OFLAG_REQ) { vshError(ctl, "parameter '%s' of command '%s' misused VSH_OFLAG_REQ", opt->name, cmd->name); - return -1; /* neither bool nor string options can be mandatory */ + return -1; /* bool can't be mandatory */ } - seenOptionalOption = true; break; case VSH_OT_ALIAS: { @@ -401,29 +396,15 @@ vshCmddefCheckInternals(vshControl *ctl, } break; - case VSH_OT_DATA: - if (!(opt->flags & VSH_OFLAG_REQ)) { - vshError(ctl, "parameter '%s' of command '%s' must use VSH_OFLAG_REQ flag", - opt->name, cmd->name); - return -1; - } - - if (seenOptionalOption) { + case VSH_OT_INT: + case VSH_OT_STRING: + if (opt->positional && seenOptionalOption) { vshError(ctl, "parameter '%s' of command '%s' must be listed before optional parameters", opt->name, cmd->name); return -1; } - break; - - case VSH_OT_INT: - if (opt->flags & VSH_OFLAG_REQ) { - if (seenOptionalOption) { - vshError(ctl, "parameter '%s' of command '%s' must be listed before optional parameters", - opt->name, cmd->name); - return -1; - } - } + seenOptionalOption = !opt->required; break; } } @@ -575,7 +556,7 @@ vshCommandCheckOpts(vshControl *ctl, const vshCmd *cmd, uint64_t opts_required, const vshCmdOptDef *opt = &def->opts[i]; vshError(ctl, - opt->type == VSH_OT_DATA || opt->type == VSH_OT_ARGV ? + opt->positional ? _("command '%1$s' requires <%2$s> option") : _("command '%1$s' requires --%2$s option"), def->name, opt->name); @@ -649,7 +630,6 @@ vshCmddefHelp(const vshCmdDef *def) break; case VSH_OT_STRING: - case VSH_OT_DATA: case VSH_OT_INT: if (opt->required) { fprintf(stdout, " "); @@ -722,7 +702,6 @@ vshCmddefHelp(const vshCmdDef *def) break; case VSH_OT_STRING: - case VSH_OT_DATA: if (opt->positional) { optstr = g_strdup_printf(_("[--%1$s] <string>"), opt->name); } else { diff --git a/tools/vsh.h b/tools/vsh.h index d2591e93a6..73b908a5f2 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -89,7 +89,6 @@ typedef enum { VSH_OT_BOOL, /* optional boolean option */ VSH_OT_STRING, /* optional string option */ VSH_OT_INT, /* optional or mandatory int option */ - VSH_OT_DATA, /* string data (as non-option) */ VSH_OT_ARGV, /* remaining arguments */ VSH_OT_ALIAS, /* alternate spelling for a later argument */ } vshCmdOptType; -- 2.44.0
The flag was replaced by the 'required' field in the option definition. Remove last few uses and all assignments. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh-domain-monitor.c | 2 -- tools/virsh-domain.c | 62 +----------------------------------- tools/virsh-host.c | 5 --- tools/virsh-interface.c | 6 ---- tools/virsh-network.c | 7 ---- tools/virsh-nodedev.c | 10 ------ tools/virsh-nwfilter.c | 5 --- tools/virsh-pool.c | 4 --- tools/virsh-secret.c | 4 --- tools/virsh-snapshot.c | 1 - tools/virsh-volume.c | 6 ---- tools/virsh.h | 3 -- tools/virt-admin.c | 12 +------ tools/vsh.c | 8 ++--- tools/vsh.h | 1 - 15 files changed, 6 insertions(+), 130 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 568ff770a1..6c2499fb9f 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -740,7 +740,6 @@ static const vshCmdOptDef opts_domif_getlink[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainInterfaceCompleter, .help = N_("interface device (MAC Address)") }, @@ -1042,7 +1041,6 @@ static const vshCmdOptDef opts_domifstat[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainInterfaceCompleter, .help = N_("interface device specified by name or MAC Address") }, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1dbef9a7a6..7c2613c85b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -422,14 +422,13 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ | VSH_OFLAG_EMPTY_OK, + .flags = VSH_OFLAG_EMPTY_OK, .help = N_("source of disk device or name of network disk") }, {.name = "target", .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("target of disk device") }, @@ -818,14 +817,12 @@ static const vshCmdOptDef opts_attach_interface[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("network interface type") }, {.name = "source", .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("source of network interface") }, {.name = "target", @@ -1198,7 +1195,6 @@ static const vshCmdOptDef opts_blkdeviotune[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("block device") }, @@ -1993,7 +1989,6 @@ static const vshCmdOptDef opts_blockcommit[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("fully-qualified path of disk") }, @@ -2214,7 +2209,6 @@ static const vshCmdOptDef opts_blockcopy[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("fully-qualified path of source disk") }, @@ -2548,7 +2542,6 @@ static const vshCmdOptDef opts_blockjob[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("fully-qualified path of disk") }, @@ -2761,7 +2754,6 @@ static const vshCmdOptDef opts_blockpull[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("fully-qualified path of disk") }, @@ -2905,7 +2897,6 @@ static const vshCmdOptDef opts_blockresize[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("Fully-qualified path of block device") }, @@ -3064,7 +3055,6 @@ static const vshCmdOptDef opts_domif_setlink[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainInterfaceCompleter, .help = N_("interface device (MAC Address)") }, @@ -3072,7 +3062,6 @@ static const vshCmdOptDef opts_domif_setlink[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainInterfaceStateCompleter, .help = N_("new state of the device") }, @@ -3214,7 +3203,6 @@ static const vshCmdOptDef opts_domiftune[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainInterfaceCompleter, .help = N_("interface device (MAC Address)") }, @@ -3441,7 +3429,6 @@ static const vshCmdOptDef opts_dom_pm_suspend[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshNodeSuspendTargetCompleter, .help = N_("mem(Suspend-to-RAM), " "disk(Suspend-to-Disk), " @@ -4126,7 +4113,6 @@ static const vshCmdOptDef opts_save[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("where to save the data") }, {.name = "bypass-cache", @@ -4477,7 +4463,6 @@ static const vshCmdOptDef opts_save_image_dumpxml[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("saved state file to read") }, {.name = "security-info", @@ -4536,14 +4521,12 @@ static const vshCmdOptDef opts_save_image_define[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("saved state file to modify") }, {.name = "xml", .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompletePathLocalExisting, .help = N_("filename containing updated XML for the target") }, @@ -4603,7 +4586,6 @@ static const vshCmdOptDef opts_save_image_edit[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("saved state file to edit") }, {.name = "running", @@ -4944,7 +4926,6 @@ static const vshCmdOptDef opts_managed_save_define[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompletePathLocalExisting, .help = N_("filename containing updated XML for the target") }, @@ -5222,7 +5203,6 @@ static const vshCmdOptDef opts_restore[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("the state to restore") }, {.name = "bypass-cache", @@ -5307,7 +5287,6 @@ static const vshCmdOptDef opts_dump[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("where to dump the core") }, VIRSH_COMMON_OPT_LIVE(N_("perform a live core dump if supported")), @@ -5608,7 +5587,6 @@ static const vshCmdOptDef opts_setLifecycleAction[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainLifecycleCompleter, .help = N_("lifecycle type to modify") }, @@ -5616,7 +5594,6 @@ static const vshCmdOptDef opts_setLifecycleAction[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainLifecycleActionCompleter, .help = N_("lifecycle action to set") }, @@ -5704,14 +5681,12 @@ static const vshCmdOptDef opts_set_user_password[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("the username") }, {.name = "password", .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("the new password") }, @@ -7128,7 +7103,6 @@ static const vshCmdOptDef opts_setvcpus[] = { .type = VSH_OT_INT, .required = true, .positional = true, - .flags = VSH_OFLAG_REQ, .help = N_("number of virtual CPUs") }, {.name = "maximum", @@ -7296,7 +7270,6 @@ static const vshCmdOptDef opts_setvcpu[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainVcpulistCompleter, .help = N_("ids of vcpus to manipulate") }, @@ -7372,7 +7345,6 @@ static const vshCmdOptDef opts_domblkthreshold[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("device to set threshold for") }, @@ -7380,7 +7352,6 @@ static const vshCmdOptDef opts_domblkthreshold[] = { .type = VSH_OT_INT, .required = true, .positional = true, - .flags = VSH_OFLAG_REQ, .help = N_("threshold as a scaled number (by default bytes)") }, {.name = NULL} @@ -7504,7 +7475,6 @@ static const vshCmdOptDef opts_iothreadpin[] = { .type = VSH_OT_INT, .required = true, .positional = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainIOThreadIdCompleter, .help = N_("IOThread ID number") }, @@ -7512,7 +7482,6 @@ static const vshCmdOptDef opts_iothreadpin[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainCpulistCompleter, .help = N_("host cpu number(s) to set") }, @@ -7581,7 +7550,6 @@ static const vshCmdOptDef opts_iothreadadd[] = { .type = VSH_OT_INT, .required = true, .positional = true, - .flags = VSH_OFLAG_REQ, .help = N_("iothread for the new IOThread") }, VIRSH_COMMON_OPT_DOMAIN_CONFIG, @@ -7639,7 +7607,6 @@ static const vshCmdOptDef opts_iothreadset[] = { .type = VSH_OT_INT, .required = true, .positional = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainIOThreadIdCompleter, .help = N_("iothread id of existing IOThread") }, @@ -7757,7 +7724,6 @@ static const vshCmdOptDef opts_iothreaddel[] = { .type = VSH_OT_INT, .required = true, .positional = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainIOThreadIdCompleter, .help = N_("iothread_id for the IOThread to delete") }, @@ -8368,7 +8334,6 @@ static const vshCmdOptDef opts_metadata[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("URI of the namespace") }, VIRSH_COMMON_OPT_LIVE(N_("modify/get running state")), @@ -8547,7 +8512,6 @@ static const vshCmdOptDef opts_send_key[] = { {.name = "keycode", .type = VSH_OT_ARGV, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshKeycodeNameCompleter, .help = N_("the key code") }, @@ -8633,7 +8597,6 @@ static const vshCmdOptDef opts_send_process_signal[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("the process ID") }, @@ -8641,7 +8604,6 @@ static const vshCmdOptDef opts_send_process_signal[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainSignalCompleter, .help = N_("the signal number or name") }, @@ -8731,7 +8693,6 @@ static const vshCmdOptDef opts_setmem[] = { .type = VSH_OT_INT, .required = true, .positional = true, - .flags = VSH_OFLAG_REQ, .help = N_("new memory size, as scaled integer (default KiB)") }, VIRSH_COMMON_OPT_DOMAIN_CONFIG, @@ -8802,7 +8763,6 @@ static const vshCmdOptDef opts_setmaxmem[] = { .type = VSH_OT_INT, .required = true, .positional = true, - .flags = VSH_OFLAG_REQ, .help = N_("new maximum memory size, as scaled integer (default KiB)") }, VIRSH_COMMON_OPT_DOMAIN_CONFIG, @@ -9577,7 +9537,6 @@ static const vshCmdOptDef opts_dom_fd_associate[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("name of the FD group") }, @@ -9585,7 +9544,6 @@ static const vshCmdOptDef opts_dom_fd_associate[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("file descriptors N,M,... to associate") }, @@ -9662,7 +9620,6 @@ static const vshCmdOptDef opts_qemu_monitor_command[] = { {.name = "cmd", .type = VSH_OT_ARGV, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("command") }, {.name = NULL} @@ -9999,7 +9956,6 @@ static const vshCmdOptDef opts_qemu_attach[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("pid") }, @@ -10057,7 +10013,6 @@ static const vshCmdOptDef opts_qemu_agent_command[] = { {.name = "cmd", .type = VSH_OT_ARGV, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("command") }, {.name = NULL} @@ -10154,7 +10109,6 @@ static const vshCmdOptDef opts_lxc_enter_namespace[] = { {.name = "cmd", .type = VSH_OT_ARGV, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("command to run") }, {.name = NULL} @@ -10335,14 +10289,12 @@ static const vshCmdOptDef opts_domxmlfromnative[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("source config data format") }, {.name = "config", .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompletePathLocalExisting, .help = N_("config data file to import from") }, @@ -10387,7 +10339,6 @@ static const vshCmdOptDef opts_domxmltonative[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("target config data type format") }, VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(VSH_OFLAG_REQ_OPT, 0), @@ -10456,7 +10407,6 @@ static const vshCmdOptDef opts_domname[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainUUIDCompleter, .help = N_("domain id or uuid") }, @@ -10491,7 +10441,6 @@ static const vshCmdOptDef opts_domrename[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("new domain name") }, @@ -10595,7 +10544,6 @@ static const vshCmdOptDef opts_migrate[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("connection URI of the destination host as seen from the client(normal migration) or source(p2p migration)") }, @@ -11294,7 +11242,6 @@ static const vshCmdOptDef opts_migrate_setmaxdowntime[] = { .type = VSH_OT_INT, .required = true, .positional = true, - .flags = VSH_OFLAG_REQ, .help = N_("maximum tolerable downtime (in milliseconds) for migration") }, {.name = NULL} @@ -11414,7 +11361,6 @@ static const vshCmdOptDef opts_migrate_setspeed[] = { .type = VSH_OT_INT, .required = true, .positional = true, - .flags = VSH_OFLAG_REQ, .help = N_("migration bandwidth limit in MiB/s") }, {.name = "postcopy", @@ -12005,7 +11951,6 @@ static const vshCmdOptDef opts_detach_device_alias[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainDeviceAliasCompleter, .help = N_("device alias") }, @@ -12135,7 +12080,6 @@ static const vshCmdOptDef opts_detach_interface[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("network interface type") }, {.name = "mac", @@ -12509,7 +12453,6 @@ static const vshCmdOptDef opts_detach_disk[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("target of disk device") }, @@ -12671,7 +12614,6 @@ static const vshCmdOptDef opts_change_media[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshDomainDiskTargetCompleter, .help = N_("Fully-qualified path or target of disk device") }, @@ -13147,7 +13089,6 @@ static const vshCmdOptDef opts_get_user_sshkeys[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("user to list authorized keys for"), }, {.name = NULL} @@ -13196,7 +13137,6 @@ static const vshCmdOptDef opts_set_user_sshkeys[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("user to set authorized keys for"), }, {.name = "file", diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 97de6f8bed..ffb993de79 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -470,7 +470,6 @@ static const vshCmdOptDef opts_allocpages[] = { .type = VSH_OT_INT, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshAllocpagesPagesizeCompleter, .help = N_("page size (in kibibytes)") }, @@ -478,7 +477,6 @@ static const vshCmdOptDef opts_allocpages[] = { .type = VSH_OT_INT, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("page count") }, {.name = "cellno", @@ -949,7 +947,6 @@ static const vshCmdOptDef opts_node_suspend[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshNodeSuspendTargetCompleter, .help = N_("mem(Suspend-to-RAM), disk(Suspend-to-Disk), " "hybrid(Hybrid-Suspend)") @@ -958,7 +955,6 @@ static const vshCmdOptDef opts_node_suspend[] = { .type = VSH_OT_INT, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("Suspend duration in seconds, at least 60") }, {.name = NULL} @@ -1281,7 +1277,6 @@ static const vshCmdOptDef opts_cpu_models[] = { .positional = true, .required = true, .completer = virshArchCompleter, - .flags = VSH_OFLAG_REQ, .help = N_("architecture") }, {.name = NULL} diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 109378ca71..1b1344c17c 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -23,7 +23,6 @@ .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ - .flags = VSH_OFLAG_REQ, \ .help = N_("interface name or MAC address"), \ .completer = virshInterfaceNameCompleter, \ .completer_flags = cflags, \ @@ -387,7 +386,6 @@ static const vshCmdOptDef opts_interface_name[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshInterfaceMacCompleter, .help = N_("interface mac") }, @@ -420,7 +418,6 @@ static const vshCmdOptDef opts_interface_mac[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshInterfaceNameCompleter, .help = N_("interface name") }, @@ -724,7 +721,6 @@ static const vshCmdOptDef opts_interface_bridge[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshInterfaceNameCompleter, .help = N_("existing interface name") }, @@ -732,7 +728,6 @@ static const vshCmdOptDef opts_interface_bridge[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("new bridge device name") }, {.name = "no-stp", @@ -955,7 +950,6 @@ static const vshCmdOptDef opts_interface_unbridge[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("current bridge device name") }, {.name = "no-start", diff --git a/tools/virsh-network.c b/tools/virsh-network.c index edbcebd682..376de46cf4 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -35,7 +35,6 @@ .type = VSH_OT_STRING,\ .positional = true, \ .required = true, \ - .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshNetworkNameCompleter, \ .completer_flags = cflags, \ @@ -60,7 +59,6 @@ .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ - .flags = VSH_OFLAG_REQ, \ .help = N_("port UUID"), \ .completer = virshNetworkPortUUIDCompleter, \ .completer_flags = cflags, \ @@ -526,7 +524,6 @@ static const vshCmdOptDef opts_network_metadata[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("URI of the namespace") }, VIRSH_COMMON_OPT_LIVE(N_("modify/get running state")), @@ -1153,7 +1150,6 @@ static const vshCmdOptDef opts_network_name[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshNetworkUUIDCompleter, .help = N_("network uuid") }, @@ -1252,7 +1248,6 @@ static const vshCmdOptDef opts_network_update[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshNetworkUpdateCommandCompleter, .help = N_("type of update (add-first, add-last (add), delete, or modify)") }, @@ -1260,7 +1255,6 @@ static const vshCmdOptDef opts_network_update[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshNetworkUpdateSectionCompleter, .help = N_("which section of network configuration to update") }, @@ -1268,7 +1262,6 @@ static const vshCmdOptDef opts_network_update[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompletePathLocalExisting, .help = N_("name of file containing xml (or, if it starts with '<', the complete " "xml element itself) to add/modify, or to be matched for search") diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 7d63581436..90cfc187e5 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -99,7 +99,6 @@ static const vshCmdOptDef opts_node_device_destroy[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, }, @@ -575,7 +574,6 @@ static const vshCmdOptDef opts_node_device_dumpxml[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, }, @@ -640,7 +638,6 @@ static const vshCmdOptDef opts_node_device_detach[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("device key"), .completer = virshNodeDeviceNameCompleter, }, @@ -704,7 +701,6 @@ static const vshCmdOptDef opts_node_device_reattach[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("device key"), .completer = virshNodeDeviceNameCompleter, }, @@ -751,7 +747,6 @@ static const vshCmdOptDef opts_node_device_reset[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("device key"), .completer = virshNodeDeviceNameCompleter, }, @@ -1014,7 +1009,6 @@ static const vshCmdOptDef opts_node_device_undefine[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, }, @@ -1107,7 +1101,6 @@ static const vshCmdOptDef opts_node_device_start[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("device name"), .completer = virshNodeDeviceNameCompleter, }, @@ -1154,7 +1147,6 @@ static const vshCmdOptDef opts_node_device_autostart[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, }, @@ -1213,7 +1205,6 @@ static const vshCmdOptDef opts_node_device_info[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, }, @@ -1265,7 +1256,6 @@ static const vshCmdOptDef opts_node_device_update[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("device name or wwn pair in 'wwnn,wwpn' format"), .completer = virshNodeDeviceNameCompleter, }, diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index faa8e98130..f54d2a0ae5 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -131,7 +131,6 @@ static const vshCmdOptDef opts_nwfilter_undefine[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("network filter name or uuid"), .completer = virshNWFilterNameCompleter, }, @@ -171,7 +170,6 @@ static const vshCmdOptDef opts_nwfilter_dumpxml[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("network filter name or uuid"), .completer = virshNWFilterNameCompleter, }, @@ -397,7 +395,6 @@ static const vshCmdOptDef opts_nwfilter_edit[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("network filter name or uuid"), .completer = virshNWFilterNameCompleter, }, @@ -534,7 +531,6 @@ static const vshCmdOptDef opts_nwfilter_binding_delete[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("network filter binding port dev"), .completer = virshNWFilterBindingNameCompleter, }, @@ -576,7 +572,6 @@ static const vshCmdOptDef opts_nwfilter_binding_dumpxml[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("network filter binding portdev"), .completer = virshNWFilterBindingNameCompleter, }, diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 8557e0d5e0..67cc1b94cf 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -60,7 +60,6 @@ .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ - .flags = VSH_OFLAG_REQ, \ .completer = virshCompleteEmpty, \ .help = N_("name of the pool") \ }, \ @@ -68,7 +67,6 @@ .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ - .flags = VSH_OFLAG_REQ, \ .completer = virshPoolTypeCompleter, \ .help = N_("type of the pool") \ }, \ @@ -1360,7 +1358,6 @@ static const vshCmdOptDef opts_find_storage_pool_sources_as[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshPoolTypeCompleter, .help = N_("type of storage pool sources to find") }, @@ -1445,7 +1442,6 @@ static const vshCmdOptDef opts_find_storage_pool_sources[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshPoolTypeCompleter, .help = N_("type of storage pool sources to discover") }, diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 0d0db9877b..7e10afa765 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -126,7 +126,6 @@ static const vshCmdOptDef opts_secret_dumpxml[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("secret UUID"), .completer = virshSecretUUIDCompleter, }, @@ -183,7 +182,6 @@ static const vshCmdOptDef opts_secret_set_value[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("secret UUID"), .completer = virshSecretUUIDCompleter, }, @@ -296,7 +294,6 @@ static const vshCmdOptDef opts_secret_get_value[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("secret UUID"), .completer = virshSecretUUIDCompleter, }, @@ -351,7 +348,6 @@ static const vshCmdOptDef opts_secret_undefine[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("secret UUID"), .completer = virshSecretUUIDCompleter, }, diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 9658fdefcd..899bae7e9a 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1570,7 +1570,6 @@ static const vshCmdOptDef opts_snapshot_dumpxml[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("snapshot name"), .completer = virshSnapshotNameCompleter, }, diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 90a450ad14..8794126f21 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -59,7 +59,6 @@ .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ - .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshStorageVolNameCompleter, \ } @@ -69,7 +68,6 @@ .type = VSH_OT_STRING, \ .positional = true, \ .required = true, \ - .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshStorageVolKeyCompleter, \ } @@ -179,7 +177,6 @@ static const vshCmdOptDef opts_vol_create_as[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("name of the volume") }, @@ -187,7 +184,6 @@ static const vshCmdOptDef opts_vol_create_as[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("size of the vol, as scaled integer (default bytes)") }, @@ -530,7 +526,6 @@ static const vshCmdOptDef opts_vol_clone[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("clone name") }, @@ -1036,7 +1031,6 @@ static const vshCmdOptDef opts_vol_resize[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = virshCompleteEmpty, .help = N_("new capacity for the vol, as scaled integer (default bytes)") }, diff --git a/tools/virsh.h b/tools/virsh.h index b009ed5854..73c0b826a5 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -60,7 +60,6 @@ .type = VSH_OT_STRING,\ .positional = true, \ .required = true, \ - .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshStoragePoolNameCompleter, \ .completer_flags = cflags, \ @@ -71,7 +70,6 @@ .type = VSH_OT_STRING,\ .positional = true, \ .required = true, \ - .flags = VSH_OFLAG_REQ, \ .help = _helpstr, \ .completer = virshDomainNameCompleter, \ .completer_flags = cflags, \ @@ -107,7 +105,6 @@ .type = VSH_OT_STRING, \ .required = required_, \ .positional = required_, \ - .flags = required_ ? VSH_OFLAG_REQ : VSH_OFLAG_NONE, \ .completer = virshCompletePathLocalExisting, \ .help = _helpstr \ } diff --git a/tools/virt-admin.c b/tools/virt-admin.c index d119116124..37bc6fe4f0 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -361,7 +361,6 @@ static const vshCmdOptDef opts_srv_threadpool_info[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("Server to retrieve threadpool attributes from."), }, @@ -420,7 +419,6 @@ static const vshCmdOptDef opts_srv_threadpool_set[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("Server to alter threadpool attributes on."), }, @@ -523,7 +521,6 @@ static const vshCmdOptDef opts_srv_clients_list[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("server which to list connected clients from"), }, @@ -607,7 +604,6 @@ static const vshCmdOptDef opts_client_info[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("server to which <client> is connected to"), }, @@ -615,7 +611,6 @@ static const vshCmdOptDef opts_client_info[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("client which to retrieve identity information for"), }, {.name = NULL} @@ -693,7 +688,6 @@ static const vshCmdOptDef opts_client_disconnect[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("server which the client is currently connected to"), }, @@ -701,7 +695,6 @@ static const vshCmdOptDef opts_client_disconnect[] = { .type = VSH_OT_INT, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("client which to disconnect, specified by ID"), }, {.name = NULL} @@ -758,7 +751,6 @@ static const vshCmdOptDef opts_srv_clients_info[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("Server to retrieve the client limits from."), }, @@ -814,7 +806,6 @@ static const vshCmdOptDef opts_srv_clients_set[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .completer = vshAdmServerCompleter, .help = N_("Server to alter the client-related configuration limits on."), }, @@ -913,7 +904,6 @@ static const vshCmdOptDef opts_srv_update_tls_file[] = { .type = VSH_OT_STRING, .positional = true, .required = true, - .flags = VSH_OFLAG_REQ, .help = N_("Available servers on a daemon. " "Currently only supports 'libvirtd' or 'virtproxyd'.") }, @@ -1013,7 +1003,7 @@ static const vshCmdOptDef opts_daemon_timeout[] = { .type = VSH_OT_INT, .required = true, .help = N_("number of seconds the daemon will run without any active connection"), - .flags = VSH_OFLAG_REQ | VSH_OFLAG_REQ_OPT + .flags = VSH_OFLAG_REQ_OPT }, {.name = NULL} }; diff --git a/tools/vsh.c b/tools/vsh.c index 7e8fbf8050..85296c35c7 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -345,8 +345,8 @@ vshCmddefCheckInternals(vshControl *ctl, return -1; } - if (opt->flags & VSH_OFLAG_REQ) { - vshError(ctl, "parameter '%s' of command '%s' misused VSH_OFLAG_REQ", + if (opt->required) { + vshError(ctl, "parameter '%s' of command '%s' misused 'required' flag", opt->name, cmd->name); return -1; /* bool can't be mandatory */ } @@ -445,7 +445,7 @@ vshCmddefOptParse(const vshCmdDef *cmd, if (!(opt->flags & VSH_OFLAG_REQ_OPT)) *opts_need_arg |= 1ULL << i; - if (opt->flags & VSH_OFLAG_REQ) + if (opt->required) *opts_required |= 1ULL << i; } } @@ -800,7 +800,7 @@ vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt, if (!cmd->skipChecks) assert(valid && (!needData || valid->type != VSH_OT_BOOL)); - if (valid && valid->flags & VSH_OFLAG_REQ) + if (valid && valid->required) ret = -1; /* See if option is present on command line. */ diff --git a/tools/vsh.h b/tools/vsh.h index 73b908a5f2..5f3e610dd7 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -98,7 +98,6 @@ typedef enum { */ enum { VSH_OFLAG_NONE = 0, /* without flags */ - VSH_OFLAG_REQ = (1 << 0), /* option required */ VSH_OFLAG_EMPTY_OK = (1 << 1), /* empty string option allowed */ VSH_OFLAG_REQ_OPT = (1 << 2), /* --optionname required */ }; -- 2.44.0
The command line parser automatically requires the option name for any optional arguments, but for required non-positional ones special handling needs to be done. This patch makes the VSH_OFLAG_REQ_OPT flag completely redundant as it can be calculated. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/virsh-backup.c | 1 - tools/virsh-checkpoint.c | 1 - tools/virsh-domain-monitor.c | 1 - tools/virsh-domain.c | 16 +--------------- tools/virsh-host.c | 2 -- tools/virsh-interface.c | 1 - tools/virsh-network.c | 2 -- tools/virsh-nodedev.c | 1 - tools/virsh-nwfilter.c | 2 -- tools/virsh-pool.c | 1 - tools/virsh-secret.c | 2 -- tools/virsh-snapshot.c | 2 -- tools/virsh-volume.c | 1 - tools/virt-admin.c | 1 - tools/vsh.c | 6 +++++- tools/vsh.h | 1 - 16 files changed, 6 insertions(+), 35 deletions(-) diff --git a/tools/virsh-backup.c b/tools/virsh-backup.c index 7a7834d7ff..f8b11355a1 100644 --- a/tools/virsh-backup.c +++ b/tools/virsh-backup.c @@ -107,7 +107,6 @@ static const vshCmdOptDef opts_backup_dumpxml[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index 869c071700..ef086fd1a5 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -826,7 +826,6 @@ static const vshCmdOptDef opts_checkpoint_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 6c2499fb9f..ff2872d497 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -277,7 +277,6 @@ static const vshCmdOptDef opts_dommemstat[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "period", .type = VSH_OT_INT, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("period in seconds to set collection") }, VIRSH_COMMON_OPT_CONFIG(N_("affect next boot")), diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7c2613c85b..65c67ff038 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3436,7 +3436,6 @@ static const vshCmdOptDef opts_dom_pm_suspend[] = { }, {.name = "duration", .type = VSH_OT_INT, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("duration in seconds") }, {.name = NULL} @@ -4471,7 +4470,6 @@ static const vshCmdOptDef opts_save_image_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, @@ -4877,7 +4875,6 @@ static const vshCmdOptDef opts_managed_save_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, @@ -4987,12 +4984,10 @@ static const vshCmdOptDef opts_schedinfo[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "weight", .type = VSH_OT_INT, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("weight for XEN_CREDIT") }, {.name = "cap", .type = VSH_OT_INT, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("cap for XEN_CREDIT") }, VIRSH_COMMON_OPT_CURRENT(N_("get/set current scheduler info")), @@ -8500,13 +8495,11 @@ static const vshCmdOptDef opts_send_key[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "codeset", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCodesetNameCompleter, .help = N_("the codeset of keycodes, default:linux") }, {.name = "holdtime", .type = VSH_OT_INT, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("the time (in milliseconds) how long the keys will be held") }, {.name = "keycode", @@ -9436,12 +9429,10 @@ static const vshCmdOptDef opts_domsetlaunchsecstate[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "secrethdr", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("path to file containing the secret header"), }, {.name = "secret", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("path to file containing the secret"), }, {.name = "set-address", @@ -9613,7 +9604,6 @@ static const vshCmdOptDef opts_qemu_monitor_command[] = { }, {.name = "pass-fds", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("pass file descriptors N,M,... along with the command") }, @@ -9995,7 +9985,6 @@ static const vshCmdOptDef opts_qemu_agent_command[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "timeout", .type = VSH_OT_INT, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("timeout seconds. must be positive.") }, {.name = "async", @@ -10231,7 +10220,6 @@ static const vshCmdOptDef opts_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, @@ -10341,7 +10329,7 @@ static const vshCmdOptDef opts_domxmltonative[] = { .required = true, .help = N_("target config data type format") }, - VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(VSH_OFLAG_REQ_OPT, 0), + VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(0, 0), {.name = "xml", .type = VSH_OT_STRING, .completer = virshCompletePathLocalExisting, @@ -11311,7 +11299,6 @@ static const vshCmdOptDef opts_migrate_compcache[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "size", .type = VSH_OT_INT, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("requested size of the cache (in bytes) used for compression") }, {.name = NULL} @@ -12964,7 +12951,6 @@ static const vshCmdOptDef opts_guest_agent_timeout[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name = "timeout", .type = VSH_OT_INT, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("timeout seconds.") }, {.name = NULL} diff --git a/tools/virsh-host.c b/tools/virsh-host.c index ffb993de79..94b1879d5f 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -45,7 +45,6 @@ static const vshCmdInfo info_capabilities = { static const vshCmdOptDef opts_capabilities[] = { {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, @@ -104,7 +103,6 @@ static const vshCmdOptDef opts_domcapabilities[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 1b1344c17c..6f79dc4ba5 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -453,7 +453,6 @@ static const vshCmdOptDef opts_interface_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 376de46cf4..e38ecff443 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -665,7 +665,6 @@ static const vshCmdOptDef opts_network_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, @@ -1891,7 +1890,6 @@ static const vshCmdOptDef opts_network_port_dumpxml[] = { VIRSH_COMMON_OPT_NETWORK_PORT(0), {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 90cfc187e5..23b1d45c92 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -583,7 +583,6 @@ static const vshCmdOptDef opts_node_device_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index f54d2a0ae5..69473b4935 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -175,7 +175,6 @@ static const vshCmdOptDef opts_nwfilter_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, @@ -577,7 +576,6 @@ static const vshCmdOptDef opts_nwfilter_binding_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 67cc1b94cf..7bbdd7d661 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -729,7 +729,6 @@ static const vshCmdOptDef opts_pool_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 7e10afa765..f99e17f2e8 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -131,7 +131,6 @@ static const vshCmdOptDef opts_secret_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, @@ -187,7 +186,6 @@ static const vshCmdOptDef opts_secret_set_value[] = { }, {.name = "file", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompletePathLocalExisting, .help = N_("read secret from file"), }, diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 899bae7e9a..80a8c9e754 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -356,7 +356,6 @@ static const vshCmdOptDef opts_snapshot_create_as[] = { }, {.name = "memspec", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .help = N_("memory attributes: [file=]name[,snapshot=type]") }, {.name = "diskspec", @@ -1579,7 +1578,6 @@ static const vshCmdOptDef opts_snapshot_dumpxml[] = { }, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 8794126f21..104a4a081c 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1119,7 +1119,6 @@ static const vshCmdOptDef opts_vol_dumpxml[] = { VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name = "xpath", .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, .completer = virshCompleteEmpty, .help = N_("xpath expression to filter the XML document") }, diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 37bc6fe4f0..c3b3cc8ccd 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1003,7 +1003,6 @@ static const vshCmdOptDef opts_daemon_timeout[] = { .type = VSH_OT_INT, .required = true, .help = N_("number of seconds the daemon will run without any active connection"), - .flags = VSH_OFLAG_REQ_OPT }, {.name = NULL} }; diff --git a/tools/vsh.c b/tools/vsh.c index 85296c35c7..c88c13fbe0 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -442,7 +442,11 @@ vshCmddefOptParse(const vshCmdDef *cmd, if (opt->type == VSH_OT_ALIAS) continue; /* skip the alias option */ - if (!(opt->flags & VSH_OFLAG_REQ_OPT)) + /* The command line parser requires the argument name for optional or + * non-positional arguments automatically, but if we need to do it + * explicitly for required non-positional arguments. + * This bitmap needs to be set on te negation of the above */ + if (!(opt->required && !opt->positional)) *opts_need_arg |= 1ULL << i; if (opt->required) diff --git a/tools/vsh.h b/tools/vsh.h index 5f3e610dd7..4b7fea8ba0 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -99,7 +99,6 @@ typedef enum { enum { VSH_OFLAG_NONE = 0, /* without flags */ VSH_OFLAG_EMPTY_OK = (1 << 1), /* empty string option allowed */ - VSH_OFLAG_REQ_OPT = (1 << 2), /* --optionname required */ }; /* forward declarations */ -- 2.44.0
On Mon, Mar 11, 2024 at 12:31:00 +0100, Peter Krempa wrote:
The command line parser automatically requires the option name for any optional arguments, but for required non-positional ones special handling needs to be done.
This patch makes the VSH_OFLAG_REQ_OPT flag completely redundant as it can be calculated.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> ---
I've noticed a regression after this patch so I'll drop it for now and post it with part 2.
Use the new flags to do the decisions which will also fix the case when an _INT option is required but non-positional. This fixes the help for the 'timeout' argument of 'daemon-timeout' virt-admin command: SYNOPSIS - daemon-timeout <timeout> + daemon-timeout --timeout <number> [...] OPTIONS - [--timeout] <number> number of seconds the daemon will run without any active connection + --timeout <number> number of seconds the daemon will run without any active connection Resolves: https://issues.redhat.com/browse/RHEL-25993 Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tools/vsh.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 521f222910..c7257586e3 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -642,31 +642,33 @@ vshCmddefHelp(const vshCmdDef *def) if (def->opts) { const vshCmdOptDef *opt; for (opt = def->opts; opt->name; opt++) { - bool required_option = opt->flags & VSH_OFLAG_REQ; switch (opt->type) { case VSH_OT_BOOL: fprintf(stdout, " [--%s]", opt->name); break; + case VSH_OT_STRING: + case VSH_OT_DATA: case VSH_OT_INT: - if (required_option) { - fprintf(stdout, " <%s>", opt->name); + if (opt->required) { + fprintf(stdout, " "); } else { - fprintf(stdout, _(" [--%1$s <number>]"), opt->name); + fprintf(stdout, " ["); } - break; - case VSH_OT_STRING: - fprintf(stdout, _(" [--%1$s <string>]"), opt->name); - break; - - case VSH_OT_DATA: - if (required_option) { - fprintf(stdout, " <%s>", opt->name); + if (opt->positional) { + fprintf(stdout, "<%s>", opt->name); } else { - fprintf(stdout, " [<%s>]", opt->name); + if (opt->type == VSH_OT_INT) { + fprintf(stdout, _("--%1$s <number>"), opt->name); + } else { + fprintf(stdout, _("--%1$s <string>"), opt->name); + } } + + if (!opt->required) + fprintf(stdout, "]"); break; case VSH_OT_ARGV: @@ -704,7 +706,6 @@ vshCmddefHelp(const vshCmdDef *def) const vshCmdOptDef *opt; fputs(_("\n OPTIONS\n"), stdout); for (opt = def->opts; opt->name; opt++) { - bool required_option = opt->flags & VSH_OFLAG_REQ; g_autofree char *optstr = NULL; switch (opt->type) { @@ -713,7 +714,7 @@ vshCmddefHelp(const vshCmdDef *def) break; case VSH_OT_INT: - if (required_option) { + if (opt->positional) { optstr = g_strdup_printf(_("[--%1$s] <number>"), opt->name); } else { optstr = g_strdup_printf(_("--%1$s <number>"), opt->name); @@ -721,11 +722,12 @@ vshCmddefHelp(const vshCmdDef *def) break; case VSH_OT_STRING: - optstr = g_strdup_printf(_("--%1$s <string>"), opt->name); - break; - case VSH_OT_DATA: - optstr = g_strdup_printf(_("[--%1$s] <string>"), opt->name); + if (opt->positional) { + optstr = g_strdup_printf(_("[--%1$s] <string>"), opt->name); + } else { + optstr = g_strdup_printf(_("--%1$s <string>"), opt->name); + } break; case VSH_OT_ARGV: -- 2.44.0
On a Monday in 2024, Peter Krempa wrote:
This series refactors the cruft in the virsh command and argument handling so that handling of options and the flags for them make actually sense.
Except for the 'timeout' parameter of 'daemon-timeout' 'virt-admin' command the behaviour is supposed to be identical.
Peter Krempa (23): vsh: Always assume that command groups are used vsh: Don't translate error messages for 'self-test' vsh: Add VSH_OT_NONE option type to catch programming errors vsh: Remove VSH_CMD_FLAG_ALIAS vshCmddefCheckInternals: Fix listing of missing completers for 'VSH_OT_ARGV' virsh: Remove uncommon redundant descriptions of virsh commands virt-admin: Drop trailing whitespaces from description of some commands virsh-domain: Don't explicitly break lines in help vsh: Add '--dump-help' option for 'self-test' command vsh: Refactor store of command help and description vshCmddefHelp: Refactor printing of help (list of arguments) vshCmddefHelp: Refactor printing of help (argument description) vshCmddefGetOption: Improve readability virsh: Inline only use of VIRSH_COMMON_OPT_DOMAIN_OT_ARGV macro vsh: Annotate 'required' and 'positional' arguments explicitly vsh: Fix broken assumption that required VSH_OT_INT must be positional vsh: Require that positional non-argv arguments are required vshCmddefCheckInternals: Remove refactoring safety checks vshCmdGrpHelp: Refactor formatting of help for VSH_OT_ARGV vshCmddefHelp: Refactor and fix printing of help for _STRING/_INT arguments vsh: Replace VSH_OT_DATA by VSH_OT_STRING vsh: remove VSH_OFLAG_REQ vsh: Automatically calculate VSH_OFLAG_REQ_OPT
tools/virsh-backup.c | 29 +- tools/virsh-checkpoint.c | 109 +-- tools/virsh-domain-event.c | 13 +- tools/virsh-domain-monitor.c | 207 ++-- tools/virsh-domain.c | 1783 ++++++++++++---------------------- tools/virsh-host.c | 311 ++---- tools/virsh-interface.c | 217 ++--- tools/virsh-network.c | 312 ++---- tools/virsh-nodedev.c | 242 ++--- tools/virsh-nwfilter.c | 144 +-- tools/virsh-pool.c | 296 ++---- tools/virsh-secret.c | 113 +-- tools/virsh-snapshot.c | 137 +-- tools/virsh-volume.c | 241 ++--- tools/virsh.c | 22 +- tools/virsh.h | 29 +- tools/virt-admin.c | 275 ++---- tools/vsh.c | 474 +++++---- tools/vsh.h | 49 +- 19 files changed, 1798 insertions(+), 3205 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (3)
-
Daniel P. Berrangé -
Ján Tomko -
Peter Krempa