From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRH8Q-0005Uh-BG for qemu-devel@nongnu.org; Fri, 08 Jun 2018 09:08:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRH8N-0006gr-Bj for qemu-devel@nongnu.org; Fri, 08 Jun 2018 09:08:54 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40046 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRH8N-0006gh-6d for qemu-devel@nongnu.org; Fri, 08 Jun 2018 09:08:51 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D8E13401DEB2 for ; Fri, 8 Jun 2018 13:08:50 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" Date: Fri, 8 Jun 2018 14:08:42 +0100 Message-Id: <20180608130846.22234-4-dgilbert@redhat.com> In-Reply-To: <20180608130846.22234-1-dgilbert@redhat.com> References: <20180608130846.22234-1-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v3 3/7] hmp: Restrict auto-complete in preconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, armbru@redhat.com, imammedo@redhat.com From: "Dr. David Alan Gilbert" Don't show the commands that aren't available. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu Reviewed-by: Igor Mammedov --- monitor.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index 31c8f5dc88..c369b392db 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.0