From 6667b23f300ff08a47a73821ce2fb7f773754969 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Fri, 29 Jul 2011 15:57:54 -0300 Subject: 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 --- qerror.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qerror.c') diff --git a/qerror.c b/qerror.c index 3d64b80b24..c591a5443c 100644 --- a/qerror.c +++ b/qerror.c @@ -193,6 +193,10 @@ static const QErrorStringTable qerror_table[] = { .error_fmt = QERR_QMP_EXTRA_MEMBER, .desc = "QMP input object member '%(member)' is unexpected", }, + { + .error_fmt = QERR_RESET_REQUIRED, + .desc = "Resetting the Virtual Machine is required", + }, { .error_fmt = QERR_SET_PASSWD_FAILED, .desc = "Could not set password", -- cgit v1.2.1