aboutsummaryrefslogtreecommitdiff
path: root/monitor/qmp-cmds.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-10-27 04:44:18 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-12-15 12:51:48 -0500
commit164dafd1744c69d268b89015977e19d8a9617fdf (patch)
tree7c3f6a9c5dfb766bdd25cfa87f37201095cd674f /monitor/qmp-cmds.c
parent69e92bd558d71fdbd0c1989391b20edcc700daa9 (diff)
remove preconfig state
The preconfig state is only used if -incoming is not specified, which makes the RunState state machine more tricky than it need be. However there is already an equivalent condition which works even with -incoming, namely qdev_hotplug. Use it instead of a separate runstate. Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'monitor/qmp-cmds.c')
-rw-r--r--monitor/qmp-cmds.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 6223a28e8b..639a219294 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -104,9 +104,8 @@ void qmp_system_powerdown(Error **errp)
void qmp_x_exit_preconfig(Error **errp)
{
- if (!runstate_check(RUN_STATE_PRECONFIG)) {
- error_setg(errp, "The command is permitted only in '%s' state",
- RunState_str(RUN_STATE_PRECONFIG));
+ if (qdev_hotplug) {
+ error_setg(errp, "The command is permitted only before machine initialization");
return;
}
qemu_exit_preconfig_request();