commit 31785f1b030b62ec84e1c852eaeeabbae1232345
author Dr. David Alan Gilbert <dgilbert@redhat.com> Wed Jun 20 16:39:42 2018 +0100
committer Dr. David Alan Gilbert <dgilbert@redhat.com> Thu Jun 21 12:48:54 2018 +0100
tree ffd3fb697f4e62d0ac2ced9ca95bffd33df1fbed
parent c3120f715db9dc351bde89b8a9d992cfeccb4680

hmp: Allow help on preconfig commands

Allow the 'help' command in preconfig state but
make it only list the preconfig commands.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20180620153947.30834-3-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

hmp-commands.hx

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 754620e..7ce991f 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -15,6 +15,7 @@
         .params     = "[cmd]",
         .help       = "show the help",
         .cmd        = do_help_cmd,
+        .flags      = "p",
     },
 
 STEXI

monitor.c

diff --git a/monitor.c b/monitor.c
index ff26d86..18c2207 100644
--- a/monitor.c
+++ b/monitor.c
@@ -979,6 +979,10 @@
 {
     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 @@
 
     /* 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,