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>stable-6.0
parent
69e92bd558
commit
164dafd174
|
@ -286,9 +286,8 @@ HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error **errp)
|
||||||
|
|
||||||
void qmp_set_numa_node(NumaOptions *cmd, Error **errp)
|
void qmp_set_numa_node(NumaOptions *cmd, Error **errp)
|
||||||
{
|
{
|
||||||
if (!runstate_check(RUN_STATE_PRECONFIG)) {
|
if (qdev_hotplug) {
|
||||||
error_setg(errp, "The command is permitted only in '%s' state",
|
error_setg(errp, "The command is permitted only before the machine has been created");
|
||||||
RunState_str(RUN_STATE_PRECONFIG));
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,7 @@ void qmp_disable_command(QmpCommandList *cmds, const char *name);
|
||||||
void qmp_enable_command(QmpCommandList *cmds, const char *name);
|
void qmp_enable_command(QmpCommandList *cmds, const char *name);
|
||||||
|
|
||||||
bool qmp_command_is_enabled(const QmpCommand *cmd);
|
bool qmp_command_is_enabled(const QmpCommand *cmd);
|
||||||
|
bool qmp_command_available(const QmpCommand *cmd, Error **errp);
|
||||||
const char *qmp_command_name(const QmpCommand *cmd);
|
const char *qmp_command_name(const QmpCommand *cmd);
|
||||||
bool qmp_has_success_response(const QmpCommand *cmd);
|
bool qmp_has_success_response(const QmpCommand *cmd);
|
||||||
QDict *qmp_error_response(Error *err);
|
QDict *qmp_error_response(Error *err);
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
#include "hw/qdev-core.h"
|
||||||
#include "monitor-internal.h"
|
#include "monitor-internal.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qapi/qmp/qdict.h"
|
#include "qapi/qmp/qdict.h"
|
||||||
|
@ -215,7 +216,7 @@ static bool cmd_can_preconfig(const HMPCommand *cmd)
|
||||||
|
|
||||||
static bool cmd_available(const HMPCommand *cmd)
|
static bool cmd_available(const HMPCommand *cmd)
|
||||||
{
|
{
|
||||||
return !runstate_check(RUN_STATE_PRECONFIG) || cmd_can_preconfig(cmd);
|
return qdev_hotplug || cmd_can_preconfig(cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void help_cmd_dump_one(Monitor *mon,
|
static void help_cmd_dump_one(Monitor *mon,
|
||||||
|
@ -658,8 +659,8 @@ static const HMPCommand *monitor_parse_command(MonitorHMP *hmp_mon,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (!cmd_available(cmd)) {
|
if (!cmd_available(cmd)) {
|
||||||
monitor_printf(mon, "Command '%.*s' not available with -preconfig "
|
monitor_printf(mon, "Command '%.*s' not available "
|
||||||
"until after exit_preconfig.\n",
|
"until machine initialization has completed.\n",
|
||||||
(int)(p - cmdp_start), cmdp_start);
|
(int)(p - cmdp_start), cmdp_start);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -104,9 +104,8 @@ void qmp_system_powerdown(Error **errp)
|
||||||
|
|
||||||
void qmp_x_exit_preconfig(Error **errp)
|
void qmp_x_exit_preconfig(Error **errp)
|
||||||
{
|
{
|
||||||
if (!runstate_check(RUN_STATE_PRECONFIG)) {
|
if (qdev_hotplug) {
|
||||||
error_setg(errp, "The command is permitted only in '%s' state",
|
error_setg(errp, "The command is permitted only before machine initialization");
|
||||||
RunState_str(RUN_STATE_PRECONFIG));
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
qemu_exit_preconfig_request();
|
qemu_exit_preconfig_request();
|
||||||
|
|
|
@ -167,10 +167,7 @@ QDict *qmp_dispatch(const QmpCommandList *cmds, QObject *request,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (runstate_check(RUN_STATE_PRECONFIG) &&
|
if (!qmp_command_available(cmd, &err)) {
|
||||||
!(cmd->options & QCO_ALLOW_PRECONFIG)) {
|
|
||||||
error_setg(&err, "The command '%s' isn't permitted in '%s' state",
|
|
||||||
cmd->name, RunState_str(RUN_STATE_PRECONFIG));
|
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,15 +50,12 @@
|
||||||
# @colo: guest is paused to save/restore VM state under colo checkpoint,
|
# @colo: guest is paused to save/restore VM state under colo checkpoint,
|
||||||
# VM can not get into this state unless colo capability is enabled
|
# VM can not get into this state unless colo capability is enabled
|
||||||
# for migration. (since 2.8)
|
# for migration. (since 2.8)
|
||||||
# @preconfig: QEMU is paused before board specific init callback is executed.
|
|
||||||
# The state is reachable only if the --preconfig CLI option is used.
|
|
||||||
# (Since 3.0)
|
|
||||||
##
|
##
|
||||||
{ 'enum': 'RunState',
|
{ 'enum': 'RunState',
|
||||||
'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused',
|
'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused',
|
||||||
'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm',
|
'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm',
|
||||||
'running', 'save-vm', 'shutdown', 'suspended', 'watchdog',
|
'running', 'save-vm', 'shutdown', 'suspended', 'watchdog',
|
||||||
'guest-panicked', 'colo', 'preconfig' ] }
|
'guest-panicked', 'colo' ] }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @ShutdownCause:
|
# @ShutdownCause:
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include "sysemu/arch_init.h"
|
#include "sysemu/arch_init.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qapi/qapi-commands-qdev.h"
|
#include "qapi/qapi-commands-qdev.h"
|
||||||
|
#include "qapi/qmp/dispatch.h"
|
||||||
#include "qapi/qmp/qdict.h"
|
#include "qapi/qmp/qdict.h"
|
||||||
#include "qapi/qmp/qerror.h"
|
#include "qapi/qmp/qerror.h"
|
||||||
#include "qemu/config-file.h"
|
#include "qemu/config-file.h"
|
||||||
|
@ -983,3 +984,14 @@ int qemu_global_option(const char *str)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool qmp_command_available(const QmpCommand *cmd, Error **errp)
|
||||||
|
{
|
||||||
|
if (!qdev_hotplug &&
|
||||||
|
!(cmd->options & QCO_ALLOW_PRECONFIG)) {
|
||||||
|
error_setg(errp, "The command '%s' is permitted only after machine initialization has completed",
|
||||||
|
cmd->name);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
13
softmmu/vl.c
13
softmmu/vl.c
|
@ -557,7 +557,7 @@ static int default_driver_check(void *opaque, QemuOpts *opts, Error **errp)
|
||||||
/***********************************************************/
|
/***********************************************************/
|
||||||
/* QEMU state */
|
/* QEMU state */
|
||||||
|
|
||||||
static RunState current_run_state = RUN_STATE_PRECONFIG;
|
static RunState current_run_state = RUN_STATE_PRELAUNCH;
|
||||||
|
|
||||||
/* We use RUN_STATE__MAX but any invalid value will do */
|
/* We use RUN_STATE__MAX but any invalid value will do */
|
||||||
static RunState vmstop_requested = RUN_STATE__MAX;
|
static RunState vmstop_requested = RUN_STATE__MAX;
|
||||||
|
@ -569,13 +569,7 @@ typedef struct {
|
||||||
} RunStateTransition;
|
} RunStateTransition;
|
||||||
|
|
||||||
static const RunStateTransition runstate_transitions_def[] = {
|
static const RunStateTransition runstate_transitions_def[] = {
|
||||||
/* from -> to */
|
{ RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE },
|
||||||
{ RUN_STATE_PRECONFIG, RUN_STATE_PRELAUNCH },
|
|
||||||
/* Early switch to inmigrate state to allow -incoming CLI option work
|
|
||||||
* as it used to. TODO: delay actual switching to inmigrate state to
|
|
||||||
* the point after machine is built and remove this hack.
|
|
||||||
*/
|
|
||||||
{ RUN_STATE_PRECONFIG, RUN_STATE_INMIGRATE },
|
|
||||||
|
|
||||||
{ RUN_STATE_DEBUG, RUN_STATE_RUNNING },
|
{ RUN_STATE_DEBUG, RUN_STATE_RUNNING },
|
||||||
{ RUN_STATE_DEBUG, RUN_STATE_FINISH_MIGRATE },
|
{ RUN_STATE_DEBUG, RUN_STATE_FINISH_MIGRATE },
|
||||||
|
@ -1471,9 +1465,6 @@ static bool main_loop_should_exit(void)
|
||||||
ShutdownCause request;
|
ShutdownCause request;
|
||||||
|
|
||||||
if (preconfig_exit_requested) {
|
if (preconfig_exit_requested) {
|
||||||
if (runstate_check(RUN_STATE_PRECONFIG)) {
|
|
||||||
runstate_set(RUN_STATE_PRELAUNCH);
|
|
||||||
}
|
|
||||||
preconfig_exit_requested = false;
|
preconfig_exit_requested = false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,7 @@ stub_ss.add(files('pci-bus.c'))
|
||||||
stub_ss.add(files('pci-host-piix.c'))
|
stub_ss.add(files('pci-host-piix.c'))
|
||||||
stub_ss.add(files('qemu-timer-notify-cb.c'))
|
stub_ss.add(files('qemu-timer-notify-cb.c'))
|
||||||
stub_ss.add(files('qmp_memory_device.c'))
|
stub_ss.add(files('qmp_memory_device.c'))
|
||||||
|
stub_ss.add(files('qmp-command-available.c'))
|
||||||
stub_ss.add(files('qtest.c'))
|
stub_ss.add(files('qtest.c'))
|
||||||
stub_ss.add(files('ram-block.c'))
|
stub_ss.add(files('ram-block.c'))
|
||||||
stub_ss.add(files('ramfb.c'))
|
stub_ss.add(files('ramfb.c'))
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
#include "qemu/osdep.h"
|
||||||
|
#include "qapi/qmp/dispatch.h"
|
||||||
|
|
||||||
|
bool qmp_command_available(const QmpCommand *cmd, Error **errp)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
|
@ -295,7 +295,7 @@ static void test_qmp_preconfig(void)
|
||||||
rsp = qtest_qmp(qs, "{ 'execute': 'query-status' }");
|
rsp = qtest_qmp(qs, "{ 'execute': 'query-status' }");
|
||||||
ret = qdict_get_qdict(rsp, "return");
|
ret = qdict_get_qdict(rsp, "return");
|
||||||
g_assert(ret);
|
g_assert(ret);
|
||||||
g_assert_cmpstr(qdict_get_try_str(ret, "status"), ==, "preconfig");
|
g_assert_cmpstr(qdict_get_try_str(ret, "status"), ==, "prelaunch");
|
||||||
qobject_unref(rsp);
|
qobject_unref(rsp);
|
||||||
|
|
||||||
/* exit preconfig state */
|
/* exit preconfig state */
|
||||||
|
|
Loading…
Reference in New Issue