[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/6] hmp: Add flag for preconfig commands
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [Qemu-devel] [PATCH 1/6] hmp: Add flag for preconfig commands |
Date: |
Thu, 7 Jun 2018 13:18:11 +0100 |
User-agent: |
Mutt/1.9.5 (2018-04-13) |
* Markus Armbruster (address@hidden) wrote:
> "Dr. David Alan Gilbert (git)" <address@hidden> writes:
>
> > From: "Dr. David Alan Gilbert" <address@hidden>
> >
> > Add a flag to command definitions to allow them to be used in preconfig
> > and check it.
> >
> > Signed-off-by: Dr. David Alan Gilbert <address@hidden>
> > ---
> > monitor.c | 19 +++++++++++++++++++
> > 1 file changed, 19 insertions(+)
> >
> > diff --git a/monitor.c b/monitor.c
> > index 6d0cec552e..50b95f41db 100644
> > --- a/monitor.c
> > +++ b/monitor.c
> > @@ -128,6 +128,7 @@ typedef struct mon_cmd_t {
> > const char *args_type;
> > const char *params;
> > const char *help;
> > + const char *flags; /* p=preconfig */
> > void (*cmd)(Monitor *mon, const QDict *qdict);
> > /* @sub_table is a list of 2nd level of commands. If it does not exist,
> > * cmd should be used. If it exists, sub_table[?].cmd should be
> > @@ -936,6 +937,19 @@ static int parse_cmdline(const char *cmdline,
> > return -1;
> > }
> >
> > +/*
> > + * Returns true if the command can be executed in preconfig mode
> > + * i.e. it has the 'p' flag.
> > + */
> > +static bool cmd_can_preconfig(const mon_cmd_t *cmd)
> > +{
> > + if (!cmd->flags) {
> > + return false;
> > + }
> > +
> > + return strchr(cmd->flags, 'p');
> > +}
> > +
> > static void help_cmd_dump_one(Monitor *mon,
> > const mon_cmd_t *cmd,
> > char **prefix_args,
> > @@ -2976,6 +2990,11 @@ static const mon_cmd_t
> > *monitor_parse_command(Monitor *mon,
> > (int)(p - cmdp_start), cmdp_start);
> > return NULL;
> > }
> > + if (runstate_check(RUN_STATE_PRECONFIG) && !cmd_can_preconfig(cmd)) {
> > + monitor_printf(mon, "Command '%.*s' not available in preconfig\n",
> > + (int)(p - cmdp_start), cmdp_start);
> > + return NULL;
> > + }
> >
> > /* filter out following useless space */
> > while (qemu_isspace(*p)) {
>
> This
>
> (qemu) c
> Command 'c' not available in preconfig
>
> is not a nice user experience. We can do better (paraphrasing myself):
>
> Command 'c' not available with -preconfig until you complete
> configuration with QMP
>
> Note that this talks to the user in the user's terms (-preconfig)
> instead of internal terms ("in preconfig", whatever that is), and is
> more specific on how to ready the monitor.
>
> Obviously, "with QMP" needs an update once HMP acquires a command to
> exit preconfig state.
This series already adds that command.
Dave
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- [Qemu-devel] [PATCH 0/6] Reenable hmp for preconfig mode, Dr. David Alan Gilbert (git), 2018/06/05
- [Qemu-devel] [PATCH 2/6] hmp: Allow help on preconfig commands, Dr. David Alan Gilbert (git), 2018/06/05
- [Qemu-devel] [PATCH 1/6] hmp: Add flag for preconfig commands, Dr. David Alan Gilbert (git), 2018/06/05
- [Qemu-devel] [PATCH 3/6] hmp: Restrict auto-complete in preconfig, Dr. David Alan Gilbert (git), 2018/06/05
- [Qemu-devel] [PATCH 4/6] hmp: Add info commands for preconfig, Dr. David Alan Gilbert (git), 2018/06/05
- Re: [Qemu-devel] [PATCH 4/6] hmp: Add info commands for preconfig, Peter Xu, 2018/06/07
- Re: [Qemu-devel] [PATCH 4/6] hmp: Add info commands for preconfig, Markus Armbruster, 2018/06/07
- Re: [Qemu-devel] [PATCH 4/6] hmp: Add info commands for preconfig, Dr. David Alan Gilbert, 2018/06/07
- Re: [Qemu-devel] [PATCH 4/6] hmp: Add info commands for preconfig, Markus Armbruster, 2018/06/07
- Re: [Qemu-devel] [PATCH 4/6] hmp: Add info commands for preconfig, Dr. David Alan Gilbert, 2018/06/07
- Re: [Qemu-devel] [PATCH 4/6] hmp: Add info commands for preconfig, Markus Armbruster, 2018/06/08
- Re: [Qemu-devel] [PATCH 4/6] hmp: Add info commands for preconfig, Dr. David Alan Gilbert, 2018/06/08