diff options
author | Luiz Capitulino | 2011-07-29 20:57:54 +0200 |
---|---|---|
committer | Luiz Capitulino | 2011-09-15 21:39:32 +0200 |
commit | 6667b23f300ff08a47a73821ce2fb7f773754969 (patch) | |
tree | 76add28b9b8049eea0cf7f1c7d711bd83314845b /monitor.c | |
parent | Drop the vm_running global variable (diff) | |
download | qemu-6667b23f300ff08a47a73821ce2fb7f773754969.tar.gz qemu-6667b23f300ff08a47a73821ce2fb7f773754969.tar.xz qemu-6667b23f300ff08a47a73821ce2fb7f773754969.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 'monitor.c')
-rw-r--r-- | monitor.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1314,7 +1314,12 @@ static int do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data) if (runstate_check(RSTATE_IN_MIGRATE)) { qerror_report(QERR_MIGRATION_EXPECTED); return -1; + } else if (runstate_check(RSTATE_PANICKED) || + runstate_check(RSTATE_SHUTDOWN)) { + qerror_report(QERR_RESET_REQUIRED); + return -1; } + bdrv_iterate(encrypted_bdrv_it, &context); /* only resume the vm if all keys are set and valid */ if (!context.err) { |