[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/6] hmp: Allow help on preconfig commands
From: |
Peter Xu |
Subject: |
Re: [Qemu-devel] [PATCH 2/6] hmp: Allow help on preconfig commands |
Date: |
Thu, 7 Jun 2018 16:51:55 +0800 |
User-agent: |
Mutt/1.9.5 (2018-04-13) |
On Tue, Jun 05, 2018 at 01:26:32PM +0100, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <address@hidden>
>
> Allow the 'help' command in preconfig state but
> make it only list the preconfig commands.
>
> Signed-off-by: Dr. David Alan Gilbert <address@hidden>
> ---
> 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 50b95f41db..7d1709c225 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)))) {
I saw that this pattern is used for multiple times already. Maybe
it's time to introduce hmp_cmd_is_available(). :) I'll leave the
decision to you...
Reviewed-by: Peter Xu <address@hidden>
--
Peter Xu