| Message ID | 20180608130846.22234-2-dgilbert@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Reenable hmp for preconfig mode | expand |
"Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> writes: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Add a flag to command definitions to allow them to be used in preconfig > and check it. > If users try to use commands that aren't available, tell them to use > the exit_preconfig comand we're adding in a few patches. > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > monitor.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/monitor.c b/monitor.c > index 6d0cec552e..f4a16e6a03 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 */ I'd add a bool for each flag instead of encoding them in a string. No need for a comment then (yours is cryptic). But your artistic license applies. > 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,12 @@ 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 with -preconfig; " > + "use exit_preconfig after configuration.\n", > + (int)(p - cmdp_start), cmdp_start); > + return NULL; > + } > > /* filter out following useless space */ > while (qemu_isspace(*p)) { Suggest "not available with -preconfig until after exit_preconfig". Regardless, Reviewed-by: Markus Armbruster <armbru@redhat.com>
* Markus Armbruster (armbru@redhat.com) wrote: > "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> writes: > > > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > > > Add a flag to command definitions to allow them to be used in preconfig > > and check it. > > If users try to use commands that aren't available, tell them to use > > the exit_preconfig comand we're adding in a few patches. > > > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > --- > > monitor.c | 20 ++++++++++++++++++++ > > 1 file changed, 20 insertions(+) > > > > diff --git a/monitor.c b/monitor.c > > index 6d0cec552e..f4a16e6a03 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 */ > > I'd add a bool for each flag instead of encoding them in a string. No > need for a comment then (yours is cryptic). But your artistic license > applies. It's a lot smaller change using the string, so simplicity won. > > 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,12 @@ 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 with -preconfig; " > > + "use exit_preconfig after configuration.\n", > > + (int)(p - cmdp_start), cmdp_start); > > + return NULL; > > + } > > > > /* filter out following useless space */ > > while (qemu_isspace(*p)) { > > Suggest "not available with -preconfig until after exit_preconfig". Done. > Regardless, > Reviewed-by: Markus Armbruster <armbru@redhat.com> Thanks. Dave -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/monitor.c b/monitor.c index 6d0cec552e..f4a16e6a03 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,12 @@ 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 with -preconfig; " + "use exit_preconfig after configuration.\n", + (int)(p - cmdp_start), cmdp_start); + return NULL; + } /* filter out following useless space */ while (qemu_isspace(*p)) {