[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 26/29] hmp: introduce cmd_available
From: |
Paolo Bonzini |
Subject: |
[PATCH 26/29] hmp: introduce cmd_available |
Date: |
Tue, 27 Oct 2020 14:21:41 -0400 |
Combine the RUN_STATE_PRECONFIG and cmd_can_preconfig checks
into a single function, to avoid repeating the same expression
(or its negation after applying DeMorgan's rule) over and
over again.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
monitor/hmp.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/monitor/hmp.c b/monitor/hmp.c
index c5cd9d372b..f13ef455e2 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -213,6 +213,11 @@ static bool cmd_can_preconfig(const HMPCommand *cmd)
return strchr(cmd->flags, 'p');
}
+static bool cmd_available(const HMPCommand *cmd)
+{
+ return !runstate_check(RUN_STATE_PRECONFIG) || cmd_can_preconfig(cmd);
+}
+
static void help_cmd_dump_one(Monitor *mon,
const HMPCommand *cmd,
char **prefix_args,
@@ -220,7 +225,7 @@ static void help_cmd_dump_one(Monitor *mon,
{
int i;
- if (runstate_check(RUN_STATE_PRECONFIG) && !cmd_can_preconfig(cmd)) {
+ if (!cmd_available(cmd)) {
return;
}
@@ -248,8 +253,7 @@ static void help_cmd_dump(Monitor *mon, const HMPCommand
*cmds,
/* Find one entry to dump */
for (cmd = cmds; cmd->name != NULL; cmd++) {
if (hmp_compare_cmd(args[arg_index], cmd->name) &&
- ((!runstate_check(RUN_STATE_PRECONFIG) ||
- cmd_can_preconfig(cmd)))) {
+ cmd_available(cmd)) {
if (cmd->sub_table) {
/* continue with next arg */
help_cmd_dump(mon, cmd->sub_table,
@@ -653,7 +657,7 @@ static const HMPCommand *monitor_parse_command(MonitorHMP
*hmp_mon,
(int)(p - cmdp_start), cmdp_start);
return NULL;
}
- if (runstate_check(RUN_STATE_PRECONFIG) && !cmd_can_preconfig(cmd)) {
+ if (!cmd_available(cmd)) {
monitor_printf(mon, "Command '%.*s' not available with -preconfig "
"until after exit_preconfig.\n",
(int)(p - cmdp_start), cmdp_start);
@@ -1225,8 +1229,7 @@ static void monitor_find_completion_by_table(MonitorHMP
*mon,
}
readline_set_completion_index(mon->rs, strlen(cmdname));
for (cmd = cmd_table; cmd->name != NULL; cmd++) {
- if (!runstate_check(RUN_STATE_PRECONFIG) ||
- cmd_can_preconfig(cmd)) {
+ if (cmd_available(cmd)) {
cmd_completion(mon, cmdname, cmd->name);
}
}
@@ -1234,8 +1237,7 @@ static void monitor_find_completion_by_table(MonitorHMP
*mon,
/* find the command */
for (cmd = cmd_table; cmd->name != NULL; cmd++) {
if (hmp_compare_cmd(args[0], cmd->name) &&
- (!runstate_check(RUN_STATE_PRECONFIG) ||
- cmd_can_preconfig(cmd))) {
+ cmd_available(cmd)) {
break;
}
}
--
2.26.2
- [PATCH 16/29] vl: move CHECKPOINT_INIT after preconfig, (continued)
- [PATCH 16/29] vl: move CHECKPOINT_INIT after preconfig, Paolo Bonzini, 2020/10/27
- [PATCH 20/29] vl: separate qemu_apply_machine_options, Paolo Bonzini, 2020/10/27
- [PATCH 22/29] vl: initialize displays before preconfig loop, Paolo Bonzini, 2020/10/27
- [PATCH 12/29] vl: create "-net nic -net user" default earlier, Paolo Bonzini, 2020/10/27
- [PATCH 21/29] vl: separate qemu_resolve_machine_memdev, Paolo Bonzini, 2020/10/27
- [PATCH 24/29] migration, vl: start migration via qmp_migrate_incoming, Paolo Bonzini, 2020/10/27
- [PATCH 14/29] vl: move semihosting command line fallback to qemu_finish_machine_init, Paolo Bonzini, 2020/10/27
- [PATCH 29/29] vl: allow -incoming defer with -preconfig, Paolo Bonzini, 2020/10/27
- [PATCH 28/29] vl: remove separate preconfig main_loop, Paolo Bonzini, 2020/10/27
- [PATCH 18/29] vl: separate qemu_create_late_backends, Paolo Bonzini, 2020/10/27
- [PATCH 26/29] hmp: introduce cmd_available,
Paolo Bonzini <=
- [PATCH 25/29] vl: start VM via qmp_cont, Paolo Bonzini, 2020/10/27
- [PATCH 17/29] vl: separate qemu_create_early_backends, Paolo Bonzini, 2020/10/27
- [PATCH 19/29] vl: separate qemu_create_machine, Paolo Bonzini, 2020/10/27
- [PATCH 27/29] remove preconfig state, Paolo Bonzini, 2020/10/27