From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSIgY-0006CN-Vh for qemu-devel@nongnu.org; Mon, 11 Jun 2018 05:00:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSIgT-0007sb-DH for qemu-devel@nongnu.org; Mon, 11 Jun 2018 05:00:23 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51396 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 1fSIgT-0007rt-7u for qemu-devel@nongnu.org; Mon, 11 Jun 2018 05:00:17 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B97D1BB42D for ; Mon, 11 Jun 2018 09:00:16 +0000 (UTC) From: Markus Armbruster References: <20180608130846.22234-1-dgilbert@redhat.com> <20180608130846.22234-3-dgilbert@redhat.com> Date: Mon, 11 Jun 2018 11:00:15 +0200 In-Reply-To: <20180608130846.22234-3-dgilbert@redhat.com> (David Alan Gilbert's message of "Fri, 8 Jun 2018 14:08:41 +0100") Message-ID: <87fu1tlmu8.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v3 2/7] hmp: Allow help on preconfig commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: qemu-devel@nongnu.org, armbru@redhat.com, imammedo@redhat.com "Dr. David Alan Gilbert (git)" writes: > From: "Dr. David Alan Gilbert" > > Allow the 'help' command in preconfig state but > make it only list the preconfig commands. > > Signed-off-by: Dr. David Alan Gilbert > Reviewed-by: Peter Xu > Reviewed-by: Igor Mammedov > --- > 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 0734fea931..8bf590ae4b 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 f4a16e6a03..31c8f5dc88 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -957,6 +957,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]); > } > @@ -979,7 +983,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)))) { Why do we need this check in addition to the one in help_cmd_dump_one()? > if (cmd->sub_table) { > /* continue with next arg */ > help_cmd_dump(mon, cmd->sub_table,