commit 6667b23f300ff08a47a73821ce2fb7f773754969
author Luiz Capitulino <lcapitulino@redhat.com> Fri Jul 29 15:57:54 2011 -0300
committer Luiz Capitulino <lcapitulino@redhat.com> Thu Sep 15 16:39:32 2011 -0300
tree 76add28b9b8049eea0cf7f1c7d711bd83314845b
parent 1354869c380cf4560fa3f0520e914cb5ee380ac8

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>

monitor.c

diff --git a/monitor.c b/monitor.c
index 442b4cf..ac68edf 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1314,7 +1314,12 @@
     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) {