From patchwork Tue Sep 6 13:14:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 113563 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DF772B6F64 for ; Tue, 6 Sep 2011 23:36:59 +1000 (EST) Received: from localhost ([::1]:36660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0vVI-00065r-Nj for incoming@patchwork.ozlabs.org; Tue, 06 Sep 2011 09:15:52 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0vUH-0002wP-BU for qemu-devel@nongnu.org; Tue, 06 Sep 2011 09:14:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0vUF-0001UX-CZ for qemu-devel@nongnu.org; Tue, 06 Sep 2011 09:14:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0vUE-0001UI-US for qemu-devel@nongnu.org; Tue, 06 Sep 2011 09:14:47 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p86DEk3x003163 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Sep 2011 09:14:46 -0400 Received: from localhost (ovpn-113-32.phx2.redhat.com [10.3.113.32]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p86DEjXl016512; Tue, 6 Sep 2011 09:14:45 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 6 Sep 2011 10:14:26 -0300 Message-Id: <1315314868-24770-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1315314868-24770-1-git-send-email-lcapitulino@redhat.com> References: <1315314868-24770-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, amit.shah@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, jan.kiszka@siemens.com Subject: [Qemu-devel] [PATCH 7/9] Monitor/QMP: Don't allow cont on bad VM state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 10cab1d..6e5bb56 100644 --- a/monitor.c +++ b/monitor.c @@ -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) { 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 b1f3352..917c348 100644 --- a/vl.c +++ b/vl.c @@ -1650,6 +1650,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);