diff options
author | Luiz Capitulino <lcapitulino@redhat.com> | 2011-07-29 15:57:54 -0300 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2011-09-15 16:39:32 -0300 |
commit | 273b7dc7c730975fe902e701e366c9c1ffb3577e (patch) | |
tree | 76add28b9b8049eea0cf7f1c7d711bd83314845b /vl.c | |
parent | 8b5d7c70f7002c2319a9b591c21096135ca7dc9d (diff) | |
download | qemu-273b7dc7c730975fe902e701e366c9c1ffb3577e.tar.gz qemu-273b7dc7c730975fe902e701e366c9c1ffb3577e.tar.bz2 qemu-273b7dc7c730975fe902e701e366c9c1ffb3577e.zip |
Monitor/QMP: Don't allow cont on bad VM state
We have two states where issuing cont before system_reset can
cause problems: RSTATE_SHUTDOWN (when -no-shutdown is used) and
RSTATE_PANICKED (which only happens with kvm).
This commit fixes that by doing the following when state is
RSTATE_SHUTDOWN or RSTATE_PANICKED:
1. returning an error to the user/client if cont is issued
2. automatically transition to RSTATE_PAUSED during system_reset
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1573,6 +1573,10 @@ static void main_loop(void) cpu_synchronize_all_states(); qemu_system_reset(VMRESET_REPORT); resume_all_vcpus(); + if (runstate_check(RSTATE_PANICKED) || + runstate_check(RSTATE_SHUTDOWN)) { + runstate_set(RSTATE_PAUSED); + } } if (qemu_powerdown_requested()) { monitor_protocol_event(QEVENT_POWERDOWN, NULL); |