[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 2/7] hmp: Allow help on preconfig commands
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH v5 2/7] hmp: Allow help on preconfig commands |
Date: |
Wed, 20 Jun 2018 16:39:42 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
Allow the 'help' command in preconfig state but
make it only list the preconfig commands.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---
hmp-commands.hx | 1 +
monitor.c | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 0de7c4c29e..3094294e5b 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -15,6 +15,7 @@ ETEXI
.params = "[cmd]",
.help = "show the help",
.cmd = do_help_cmd,
+ .flags = "p",
},
STEXI
diff --git a/monitor.c b/monitor.c
index 8dc86c0c3c..6fc20c4889 100644
--- a/monitor.c
+++ b/monitor.c
@@ -979,6 +979,10 @@ static void help_cmd_dump_one(Monitor *mon,
{
int i;
+ if (runstate_check(RUN_STATE_PRECONFIG) && !cmd_can_preconfig(cmd)) {
+ return;
+ }
+
for (i = 0; i < prefix_args_nb; i++) {
monitor_printf(mon, "%s ", prefix_args[i]);
}
@@ -1001,7 +1005,9 @@ static void help_cmd_dump(Monitor *mon, const mon_cmd_t
*cmds,
/* Find one entry to dump */
for (cmd = cmds; cmd->name != NULL; cmd++) {
- if (compare_cmd(args[arg_index], cmd->name)) {
+ if (compare_cmd(args[arg_index], cmd->name) &&
+ ((!runstate_check(RUN_STATE_PRECONFIG) ||
+ cmd_can_preconfig(cmd)))) {
if (cmd->sub_table) {
/* continue with next arg */
help_cmd_dump(mon, cmd->sub_table,
--
2.17.1
- [Qemu-devel] [PATCH v5 0/7] Reenable hmp for preconfig mode, Dr. David Alan Gilbert (git), 2018/06/20
- [Qemu-devel] [PATCH v5 2/7] hmp: Allow help on preconfig commands,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PATCH v5 4/7] qmp: Enable a few commands in preconfig state, Dr. David Alan Gilbert (git), 2018/06/20
- [Qemu-devel] [PATCH v5 3/7] hmp: Restrict auto-complete in preconfig, Dr. David Alan Gilbert (git), 2018/06/20
- [Qemu-devel] [PATCH v5 1/7] hmp: Add flag for preconfig commands, Dr. David Alan Gilbert (git), 2018/06/20
- [Qemu-devel] [PATCH v5 7/7] hmp: Allow HMP in preconfig state again, Dr. David Alan Gilbert (git), 2018/06/20
- [Qemu-devel] [PATCH v5 6/7] hmp: add exit_preconfig, Dr. David Alan Gilbert (git), 2018/06/20
- [Qemu-devel] [PATCH v5 5/7] hmp: Add commands for preconfig, Dr. David Alan Gilbert (git), 2018/06/20