qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, armbru@redhat.com, imammedo@redhat.com
Subject: [Qemu-devel] [PATCH v4 3/7] hmp: Restrict auto-complete in preconfig
Date: Tue, 12 Jun 2018 10:19:44 +0100	[thread overview]
Message-ID: <20180612091948.14367-4-dgilbert@redhat.com> (raw)
In-Reply-To: <20180612091948.14367-1-dgilbert@redhat.com>

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

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>
---
 monitor.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index 8ff0e2fcc7..9ea23828ef 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3951,12 +3951,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;
             }
         }
-- 
2.17.1

  parent reply	other threads:[~2018-06-12  9:19 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-12  9:19 [Qemu-devel] [PATCH v4 0/7] Reenable hmp for preconfig mode Dr. David Alan Gilbert (git)
2018-06-12  9:19 ` [Qemu-devel] [PATCH v4 1/7] hmp: Add flag for preconfig commands Dr. David Alan Gilbert (git)
2018-06-12  9:19 ` [Qemu-devel] [PATCH v4 2/7] hmp: Allow help on " Dr. David Alan Gilbert (git)
2018-06-12  9:19 ` Dr. David Alan Gilbert (git) [this message]
2018-06-12  9:19 ` [Qemu-devel] [PATCH v4 4/7] qmp: Enable a few commands in preconfig state Dr. David Alan Gilbert (git)
2018-06-12  9:19 ` [Qemu-devel] [PATCH v4 5/7] hmp: Add commands for preconfig Dr. David Alan Gilbert (git)
2018-06-12  9:19 ` [Qemu-devel] [PATCH v4 6/7] hmp: add exit_preconfig Dr. David Alan Gilbert (git)
2018-06-12  9:19 ` [Qemu-devel] [PATCH v4 7/7] hmp: Allow HMP in preconfig state again Dr. David Alan Gilbert (git)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180612091948.14367-4-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=armbru@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).