From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzBko-00086O-6j for qemu-devel@nongnu.org; Thu, 01 Sep 2011 14:12:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzBkg-00086d-Kp for qemu-devel@nongnu.org; Thu, 01 Sep 2011 14:12:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2970) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzBkf-00086T-UT for qemu-devel@nongnu.org; Thu, 01 Sep 2011 14:12:34 -0400 From: Luiz Capitulino Date: Thu, 1 Sep 2011 15:12:16 -0300 Message-Id: <1314900738-30164-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1314900738-30164-1-git-send-email-lcapitulino@redhat.com> References: <1314900738-30164-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 6/8] Monitor/QMP: Don't allow cont on bad VM state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, amit.shah@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, jan.kiszka@siemens.com 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 --- monitor.c | 5 +++++ qerror.c | 4 ++++ qerror.h | 3 +++ vl.c | 4 ++++ 4 files changed, 16 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 03ffd74..3468be6 100644 --- a/monitor.c +++ b/monitor.c @@ -1312,7 +1312,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) { diff --git a/qerror.c b/qerror.c index 3d64b80..c591a54 100644 --- a/qerror.c +++ b/qerror.c @@ -194,6 +194,10 @@ static const QErrorStringTable qerror_table[] = { .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", }, diff --git a/qerror.h b/qerror.h index 8058456..d407001 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': {} }" diff --git a/vl.c b/vl.c index 3c7f2bf..b535afd 100644 --- a/vl.c +++ b/vl.c @@ -1447,6 +1447,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); -- 1.7.7.rc0.72.g4b5ea