summaryrefslogtreecommitdiff
path: root/qerror.h
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2011-07-29 15:57:54 -0300
committerLuiz Capitulino <lcapitulino@redhat.com>2011-09-15 16:39:32 -0300
commit6667b23f300ff08a47a73821ce2fb7f773754969 (patch)
tree76add28b9b8049eea0cf7f1c7d711bd83314845b /qerror.h
parent1354869c380cf4560fa3f0520e914cb5ee380ac8 (diff)
downloadqemu-6667b23f300ff08a47a73821ce2fb7f773754969.tar.gz
qemu-6667b23f300ff08a47a73821ce2fb7f773754969.tar.bz2
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 'qerror.h')
-rw-r--r--qerror.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/qerror.h b/qerror.h
index 8058456d2e..d4070015f7 100644
--- a/qerror.h
+++ b/qerror.h
@@ -163,6 +163,9 @@ QError *qobject_to_qerror(const QObject *obj);
#define QERR_QMP_EXTRA_MEMBER \
"{ 'class': 'QMPExtraInputObjectMember', 'data': { 'member': %s } }"
+#define QERR_RESET_REQUIRED \
+ "{ 'class': 'ResetRequired', 'data': {} }"
+
#define QERR_SET_PASSWD_FAILED \
"{ 'class': 'SetPasswdFailed', 'data': {} }"