From: Dr. David Alan Gilbert <dgilbert@redhat.com>
Date: Wed, 20 Jun 2018 15:39:43 +0000 (+0100)
Subject: hmp: Restrict auto-complete in preconfig
X-Git-Tag: v3.0.0-rc0~67^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d9f7839b7e6c364536d22beb2ca1277772813a6;p=thirdparty%2Fqemu.git

hmp: Restrict auto-complete in preconfig

Don't show the commands that aren't available.

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-4-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---

diff --git a/monitor.c b/monitor.c
index 18c2207e6d0..068c094a9a8 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4020,12 +4020,17 @@ static void monitor_find_completion_by_table(Monitor *mon,
             cmdname = args[0];
         readline_set_completion_index(mon->rs, strlen(cmdname));
         for (cmd = cmd_table; cmd->name != NULL; cmd++) {
-            cmd_completion(mon, cmdname, cmd->name);
+            if (!runstate_check(RUN_STATE_PRECONFIG) ||
+                 cmd_can_preconfig(cmd)) {
+                cmd_completion(mon, cmdname, cmd->name);
+            }
         }
     } else {
         /* find the command */
         for (cmd = cmd_table; cmd->name != NULL; cmd++) {
-            if (compare_cmd(args[0], cmd->name)) {
+            if (compare_cmd(args[0], cmd->name) &&
+                (!runstate_check(RUN_STATE_PRECONFIG) ||
+                 cmd_can_preconfig(cmd))) {
                 break;
             }
         }