Skip to content

Commit

Permalink
vl: change runstate only if new state is different from current state
Browse files Browse the repository at this point in the history
Previously, qemu will abort at following scenario:
(qemu) stop
(qemu) system_reset
(qemu) system_reset
(qemu) 2016-04-13T20:54:38.979158Z qemu-system-x86_64: invalid runstate transition: 'prelaunch' -> 'prelaunch'

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1460604352-18630-1-git-send-email-lizhijian@cn.fujitsu.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit e92a2d9)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
  • Loading branch information
zhijianli88 authored and mdroth committed Aug 4, 2016
1 parent 5b6c12e commit 07a3a48
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions vl.c
Expand Up @@ -692,6 +692,10 @@ void runstate_set(RunState new_state)
{
assert(new_state < RUN_STATE__MAX);

if (current_run_state == new_state) {
return;
}

if (!runstate_valid_transitions[current_run_state][new_state]) {
error_report("invalid runstate transition: '%s' -> '%s'",
RunState_lookup[current_run_state],
Expand Down

0 comments on commit 07a3a48

Please sign in to comment.