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

vsh: Remove VSH_CMD_FLAG_ALIAS

Browse Source 
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>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2024-03-01 23:14:51 +01:00
parent 3fcae7a028
commit 7abb44f5f7
5 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/virsh-nodedev.c
View File

@ -1415,7 +1415,6 @@ const vshCmdDef nodedevCmds[] = {
.flags = 0 .flags = 0
}, },
{.name = "nodedev-dettach", {.name = "nodedev-dettach",
.flags = VSH_CMD_FLAG_ALIAS,
.alias = "nodedev-detach" .alias = "nodedev-detach"
}, },
{.name = "nodedev-dumpxml", {.name = "nodedev-dumpxml",

2
tools/virsh.c
View File

@ -460,7 +460,7 @@ virshUsage(void)
fprintf(stdout, _(" %1$s (help keyword '%2$s')\n"), fprintf(stdout, _(" %1$s (help keyword '%2$s')\n"),
grp->name, grp->keyword); grp->name, grp->keyword);
for (cmd = grp->commands; cmd->name; cmd++) { for (cmd = grp->commands; cmd->name; cmd++) {
if (cmd->flags & VSH_CMD_FLAG_ALIAS || if (cmd->alias ||
cmd->flags & VSH_CMD_FLAG_HIDDEN) cmd->flags & VSH_CMD_FLAG_HIDDEN)
continue; continue;
fprintf(stdout, fprintf(stdout,

9
tools/virt-admin.c
View File

@ -1262,7 +1262,7 @@ vshAdmUsage(void)
fprintf(stdout, _(" %1$s (help keyword '%2$s')\n"), fprintf(stdout, _(" %1$s (help keyword '%2$s')\n"),
grp->name, grp->keyword); grp->name, grp->keyword);
for (cmd = grp->commands; cmd->name; cmd++) { for (cmd = grp->commands; cmd->name; cmd++) {
if (cmd->flags & VSH_CMD_FLAG_ALIAS || if (cmd->alias ||
cmd->flags & VSH_CMD_FLAG_HIDDEN) cmd->flags & VSH_CMD_FLAG_HIDDEN)
continue; continue;
fprintf(stdout, fprintf(stdout,
@ -1429,7 +1429,6 @@ static const vshCmdDef vshAdmCmds[] = {
static const vshCmdDef monitoringCmds[] = { static const vshCmdDef monitoringCmds[] = {
{.name = "srv-list", {.name = "srv-list",
.flags = VSH_CMD_FLAG_ALIAS,
.alias = "server-list" .alias = "server-list"
}, },
{.name = "server-list", {.name = "server-list",
@ -1439,7 +1438,6 @@ static const vshCmdDef monitoringCmds[] = {
.flags = 0 .flags = 0
}, },
{.name = "srv-threadpool-info", {.name = "srv-threadpool-info",
.flags = VSH_CMD_FLAG_ALIAS,
.alias = "server-threadpool-info" .alias = "server-threadpool-info"
}, },
{.name = "server-threadpool-info", {.name = "server-threadpool-info",
@ -1449,7 +1447,6 @@ static const vshCmdDef monitoringCmds[] = {
.flags = 0 .flags = 0
}, },
{.name = "srv-clients-list", {.name = "srv-clients-list",
.flags = VSH_CMD_FLAG_ALIAS,
.alias = "client-list" .alias = "client-list"
}, },
{.name = "client-list", {.name = "client-list",
@ -1465,7 +1462,6 @@ static const vshCmdDef monitoringCmds[] = {
.flags = 0 .flags = 0
}, },
{.name = "srv-clients-info", {.name = "srv-clients-info",
.flags = VSH_CMD_FLAG_ALIAS,
.alias = "server-clients-info" .alias = "server-clients-info"
}, },
{.name = "server-clients-info", {.name = "server-clients-info",
@ -1479,7 +1475,6 @@ static const vshCmdDef monitoringCmds[] = {
static const vshCmdDef managementCmds[] = { static const vshCmdDef managementCmds[] = {
{.name = "srv-threadpool-set", {.name = "srv-threadpool-set",
.flags = VSH_CMD_FLAG_ALIAS,
.alias = "server-threadpool-set" .alias = "server-threadpool-set"
}, },
{.name = "server-threadpool-set", {.name = "server-threadpool-set",
@ -1495,7 +1490,6 @@ static const vshCmdDef managementCmds[] = {
.flags = 0 .flags = 0
}, },
{.name = "srv-clients-set", {.name = "srv-clients-set",
.flags = VSH_CMD_FLAG_ALIAS,
.alias = "server-clients-set" .alias = "server-clients-set"
}, },
{.name = "server-clients-set", {.name = "server-clients-set",
@ -1505,7 +1499,6 @@ static const vshCmdDef managementCmds[] = {
.flags = 0 .flags = 0
}, },
{.name = "srv-update-tls", {.name = "srv-update-tls",
.flags = VSH_CMD_FLAG_ALIAS,
.alias = "server-update-tls" .alias = "server-update-tls"
}, },
{.name = "server-update-tls", {.name = "server-update-tls",

21
tools/vsh.c
View File

@ -268,21 +268,16 @@ vshCmddefCheckInternals(vshControl *ctl,
g_auto(virBuffer) complbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) complbuf = VIR_BUFFER_INITIALIZER;
/* in order to perform the validation resolve the alias first */ /* in order to perform the validation resolve the alias first */
if (cmd->flags & VSH_CMD_FLAG_ALIAS) { if (cmd->alias) {
const vshCmdDef *alias; const vshCmdDef *alias;
if (!cmd->alias) {
vshError(ctl, "command '%s' has inconsistent alias", cmd->name);
return -1;
}
if (!(alias = vshCmddefSearch(cmd->alias))) { if (!(alias = vshCmddefSearch(cmd->alias))) {
vshError(ctl, "command alias '%s' is pointing to a non-existent command '%s'", vshError(ctl, "command alias '%s' is pointing to a non-existent command '%s'",
cmd->name, cmd->alias); cmd->name, cmd->alias);
return -1; return -1;
} }
if (alias->flags & VSH_CMD_FLAG_ALIAS) { if (alias->alias) {
vshError(ctl, "command alias '%s' is pointing to another command alias '%s'", vshError(ctl, "command alias '%s' is pointing to another command alias '%s'",
cmd->name, cmd->alias); cmd->name, cmd->alias);
return -1; return -1;
@ -303,7 +298,7 @@ vshCmddefCheckInternals(vshControl *ctl,
return -1; return -1;
} }
if (cmd->flags & ~VSH_CMD_FLAG_ALIAS) { if (cmd->flags != 0) {
vshError(ctl, "command '%s' has multiple flags set", cmd->name); vshError(ctl, "command '%s' has multiple flags set", cmd->name);
return -1; return -1;
} }
@ -615,7 +610,7 @@ vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *grp)
grp->keyword); grp->keyword);
for (cmd = grp->commands; cmd->name; cmd++) { for (cmd = grp->commands; cmd->name; cmd++) {
if (cmd->flags & VSH_CMD_FLAG_ALIAS || if (cmd->alias ||
cmd->flags & VSH_CMD_FLAG_HIDDEN) cmd->flags & VSH_CMD_FLAG_HIDDEN)
continue; continue;
vshPrint(ctl, " %-30s %s\n", cmd->name, 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 */ /* aliases need to be resolved to the actual commands */
if (cmd->flags & VSH_CMD_FLAG_ALIAS) { if (cmd->alias) {
VIR_FREE(tkdata); VIR_FREE(tkdata);
tkdata = g_strdup(cmd->alias); tkdata = g_strdup(cmd->alias);
if (!(cmd = vshCmddefSearch(tkdata))) { if (!(cmd = vshCmddefSearch(tkdata))) {
@ -2630,7 +2625,7 @@ vshReadlineCommandGenerator(void)
for (cmd_list_index = 0; cmds[cmd_list_index].name; cmd_list_index++) { for (cmd_list_index = 0; cmds[cmd_list_index].name; cmd_list_index++) {
const char *name = cmds[cmd_list_index].name; 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) cmds[cmd_list_index].flags & VSH_CMD_FLAG_HIDDEN)
continue; continue;
@ -3131,7 +3126,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd)
grp->keyword); grp->keyword);
for (def = grp->commands; def->name; def++) { for (def = grp->commands; def->name; def++) {
if (def->flags & VSH_CMD_FLAG_ALIAS || if (def->alias ||
def->flags & VSH_CMD_FLAG_HIDDEN) def->flags & VSH_CMD_FLAG_HIDDEN)
continue; continue;
vshPrint(ctl, " %-30s %s\n", def->name, vshPrint(ctl, " %-30s %s\n", def->name,
@ -3145,7 +3140,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd)
} }
if ((def = vshCmddefSearch(name))) { if ((def = vshCmddefSearch(name))) {
if (def->flags & VSH_CMD_FLAG_ALIAS) if (def->alias)
def = vshCmddefSearch(def->alias); def = vshCmddefSearch(def->alias);
} }

3
tools/vsh.h
View File

@ -162,8 +162,7 @@ struct _vshCmdOpt {
*/ */
enum { enum {
VSH_CMD_FLAG_NOCONNECT = (1 << 0), /* no prior connection needed */ 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 << 1), /* command is hidden/internal */
VSH_CMD_FLAG_HIDDEN = (1 << 2), /* command is hidden/internal */
}; };
/* /*