diff options
| author | Li Zhijian <lizhijian@cn.fujitsu.com> | 2016-04-14 11:25:52 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-05-23 16:53:44 +0200 |
| commit | e92a2d9cb3d8f589c9fe5d2eacc83d8dddea0e16 (patch) | |
| tree | 7c9d9244d055029de7b8b3bd6dae9a269960daff | |
| parent | ed1263c363c970a7ad5226b8f41dbbf0c92c1e17 (diff) | |
| download | focaccia-qemu-e92a2d9cb3d8f589c9fe5d2eacc83d8dddea0e16.tar.gz focaccia-qemu-e92a2d9cb3d8f589c9fe5d2eacc83d8dddea0e16.zip | |
vl: change runstate only if new state is different from current state
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>
| -rw-r--r-- | vl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vl.c b/vl.c index b1562d8280..2569dbb8d8 100644 --- a/vl.c +++ b/vl.c @@ -690,6 +690,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], |