RunState: Drop the RSTATE_NO_STATE value
The QAPI framework won't generate it, so we need to get rid of it. In order to do that, this commit makes RSTATE_PRE_LAUNCH the initial state and change qemu_vmstop_requested() to use RSTATE_MAX. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
0d45b70291
commit
c4d11e38bd
1
sysemu.h
1
sysemu.h
|
@ -11,7 +11,6 @@
|
||||||
/* vl.c */
|
/* vl.c */
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
RSTATE_NO_STATE,
|
|
||||||
RSTATE_DEBUG, /* qemu is running under gdb */
|
RSTATE_DEBUG, /* qemu is running under gdb */
|
||||||
RSTATE_IN_MIGRATE, /* paused waiting for an incoming migration */
|
RSTATE_IN_MIGRATE, /* paused waiting for an incoming migration */
|
||||||
RSTATE_PANICKED, /* paused due to an internal error */
|
RSTATE_PANICKED, /* paused due to an internal error */
|
||||||
|
|
19
vl.c
19
vl.c
|
@ -323,7 +323,7 @@ static int default_driver_check(QemuOpts *opts, void *opaque)
|
||||||
/***********************************************************/
|
/***********************************************************/
|
||||||
/* QEMU state */
|
/* QEMU state */
|
||||||
|
|
||||||
static RunState current_run_state = RSTATE_NO_STATE;
|
static RunState current_run_state = RSTATE_PRE_LAUNCH;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
RunState from;
|
RunState from;
|
||||||
|
@ -332,10 +332,6 @@ typedef struct {
|
||||||
|
|
||||||
static const RunStateTransition runstate_transitions_def[] = {
|
static const RunStateTransition runstate_transitions_def[] = {
|
||||||
/* from -> to */
|
/* from -> to */
|
||||||
{ RSTATE_NO_STATE, RSTATE_RUNNING },
|
|
||||||
{ RSTATE_NO_STATE, RSTATE_IN_MIGRATE },
|
|
||||||
{ RSTATE_NO_STATE, RSTATE_PRE_LAUNCH },
|
|
||||||
|
|
||||||
{ RSTATE_DEBUG, RSTATE_RUNNING },
|
{ RSTATE_DEBUG, RSTATE_RUNNING },
|
||||||
|
|
||||||
{ RSTATE_IN_MIGRATE, RSTATE_RUNNING },
|
{ RSTATE_IN_MIGRATE, RSTATE_RUNNING },
|
||||||
|
@ -350,6 +346,7 @@ static const RunStateTransition runstate_transitions_def[] = {
|
||||||
{ RSTATE_POST_MIGRATE, RSTATE_RUNNING },
|
{ RSTATE_POST_MIGRATE, RSTATE_RUNNING },
|
||||||
|
|
||||||
{ RSTATE_PRE_LAUNCH, RSTATE_RUNNING },
|
{ RSTATE_PRE_LAUNCH, RSTATE_RUNNING },
|
||||||
|
{ RSTATE_PRE_LAUNCH, RSTATE_IN_MIGRATE },
|
||||||
{ RSTATE_PRE_LAUNCH, RSTATE_POST_MIGRATE },
|
{ RSTATE_PRE_LAUNCH, RSTATE_POST_MIGRATE },
|
||||||
|
|
||||||
{ RSTATE_PRE_MIGRATE, RSTATE_RUNNING },
|
{ RSTATE_PRE_MIGRATE, RSTATE_RUNNING },
|
||||||
|
@ -424,8 +421,7 @@ void runstate_set(RunState new_state)
|
||||||
|
|
||||||
const char *runstate_as_string(void)
|
const char *runstate_as_string(void)
|
||||||
{
|
{
|
||||||
assert(current_run_state > RSTATE_NO_STATE &&
|
assert(current_run_state < RSTATE_MAX);
|
||||||
current_run_state < RSTATE_MAX);
|
|
||||||
return runstate_name_tbl[current_run_state];
|
return runstate_name_tbl[current_run_state];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1294,7 +1290,7 @@ static int shutdown_requested, shutdown_signal = -1;
|
||||||
static pid_t shutdown_pid;
|
static pid_t shutdown_pid;
|
||||||
static int powerdown_requested;
|
static int powerdown_requested;
|
||||||
static int debug_requested;
|
static int debug_requested;
|
||||||
static RunState vmstop_requested = RSTATE_NO_STATE;
|
static RunState vmstop_requested = RSTATE_MAX;
|
||||||
|
|
||||||
int qemu_shutdown_requested_get(void)
|
int qemu_shutdown_requested_get(void)
|
||||||
{
|
{
|
||||||
|
@ -1350,11 +1346,12 @@ static int qemu_debug_requested(void)
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* We use RSTATE_MAX but any invalid value will do */
|
||||||
static bool qemu_vmstop_requested(RunState *r)
|
static bool qemu_vmstop_requested(RunState *r)
|
||||||
{
|
{
|
||||||
if (vmstop_requested != RSTATE_NO_STATE) {
|
if (vmstop_requested < RSTATE_MAX) {
|
||||||
*r = vmstop_requested;
|
*r = vmstop_requested;
|
||||||
vmstop_requested = RSTATE_NO_STATE;
|
vmstop_requested = RSTATE_MAX;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3569,8 +3566,6 @@ int main(int argc, char **argv, char **envp)
|
||||||
}
|
}
|
||||||
} else if (autostart) {
|
} else if (autostart) {
|
||||||
vm_start();
|
vm_start();
|
||||||
} else {
|
|
||||||
runstate_set(RSTATE_PRE_LAUNCH);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
os_setup_post();
|
os_setup_post();
|
||||||
|
|
Reference in New Issue