motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 10:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove preconfig state

Browse source 
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>
This commit is contained in:
Paolo Bonzini 2020-10-27 04:44:18 -04:00
parent 69e92bd558
commit 164dafd174
11 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

13
softmmu/vl.c
View file

@ -557,7 +557,7 @@ static int default_driver_check(void *opaque, QemuOpts *opts, Error **errp)
/***********************************************************/
/* 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 */
static RunState vmstop_requested = RUN_STATE__MAX;
@ -569,13 +569,7 @@ typedef struct {
} RunStateTransition;
static const RunStateTransition runstate_transitions_def[] = {
/* from -> to */
{ 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_PRELAUNCH, RUN_STATE_INMIGRATE },
{ RUN_STATE_DEBUG, RUN_STATE_RUNNING },
{ RUN_STATE_DEBUG, RUN_STATE_FINISH_MIGRATE },
@ -1471,9 +1465,6 @@ static bool main_loop_should_exit(void)
ShutdownCause request;
if (preconfig_exit_requested) {
if (runstate_check(RUN_STATE_PRECONFIG)) {
runstate_set(RUN_STATE_PRELAUNCH);
}
preconfig_exit_requested = false;
return true;
}