[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/9] hmp: Add flag for preconfig commands
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 3/9] hmp: Add flag for preconfig commands |
Date: |
Thu, 21 Jun 2018 17:47:21 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
monitor.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/monitor.c b/monitor.c
index 2a8187f5d7..ff26d863db 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
@@ -958,6 +959,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,
@@ -3041,6 +3055,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 "
+ "until after exit_preconfig.\n",
+ (int)(p - cmdp_start), cmdp_start);
+ return NULL;
+ }
/* filter out following useless space */
while (qemu_isspace(*p)) {
--
2.17.1
- [Qemu-devel] [PULL 0/9] hmp queue, Dr. David Alan Gilbert (git), 2018/06/21
- [Qemu-devel] [PULL 2/9] hmp-commands: use long for begin and length in dump-guest-memory, Dr. David Alan Gilbert (git), 2018/06/21
- [Qemu-devel] [PULL 1/9] monitor: report entirety of hmp command on error, Dr. David Alan Gilbert (git), 2018/06/21
- [Qemu-devel] [PULL 3/9] hmp: Add flag for preconfig commands,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 4/9] hmp: Allow help on preconfig commands, Dr. David Alan Gilbert (git), 2018/06/21
- [Qemu-devel] [PULL 5/9] hmp: Restrict auto-complete in preconfig, Dr. David Alan Gilbert (git), 2018/06/21
- [Qemu-devel] [PULL 6/9] qmp: Enable a few commands in preconfig state, Dr. David Alan Gilbert (git), 2018/06/21
- [Qemu-devel] [PULL 7/9] hmp: Add commands for preconfig, Dr. David Alan Gilbert (git), 2018/06/21
- [Qemu-devel] [PULL 9/9] hmp: Allow HMP in preconfig state again, Dr. David Alan Gilbert (git), 2018/06/21
- [Qemu-devel] [PULL 8/9] hmp: add exit_preconfig, Dr. David Alan Gilbert (git), 2018/06/21
- Re: [Qemu-devel] [PULL 0/9] hmp queue, Peter Maydell, 2018/06/22