From patchwork Wed Aug 10 20:33: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: 109459 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 31240B6F6F for ; Thu, 11 Aug 2011 07:20:59 +1000 (EST) Received: from localhost ([::1]:50020 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrFTn-0001rb-HB for incoming@patchwork.ozlabs.org; Wed, 10 Aug 2011 16:34:19 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrFTR-000110-4q for qemu-devel@nongnu.org; Wed, 10 Aug 2011 16:34:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrFTJ-00087V-Ch for qemu-devel@nongnu.org; Wed, 10 Aug 2011 16:33:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrFTJ-00087I-21 for qemu-devel@nongnu.org; Wed, 10 Aug 2011 16:33:49 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7AKXmuh010127 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 10 Aug 2011 16:33:48 -0400 Received: from localhost (ovpn-113-72.phx2.redhat.com [10.3.113.72]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7AKXlgP030661; Wed, 10 Aug 2011 16:33:47 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 10 Aug 2011 17:33:26 -0300 Message-Id: <1313008408-23161-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1313008408-23161-1-git-send-email-lcapitulino@redhat.com> References: <1313008408-23161-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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, aliguori@us.ibm.com, jan.kiszka@siemens.com, armbru@redhat.com, avi@redhat.com, amit.shah@redhat.com Subject: [Qemu-devel] [PATCH 6/8] Monitor: 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 (when in any of the two states): 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 3de862b..82d19c0 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_get() == RSTATE_IN_MIGRATE) { qerror_report(QERR_MIGRATION_EXPECTED); return -1; + } else if (runstate_get() == RSTATE_PANICKED || + runstate_get() == 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 69c1bc9..0dd65a1 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 2b4cec2..537c5fb 100644 --- a/vl.c +++ b/vl.c @@ -1437,6 +1437,10 @@ static void main_loop(void) cpu_synchronize_all_states(); qemu_system_reset(VMRESET_REPORT); resume_all_vcpus(); + if (runstate_get() == RSTATE_PANICKED || + runstate_get() == RSTATE_SHUTDOWN) { + runstate_set(RSTATE_PAUSED); + } } if (qemu_powerdown_requested()) { monitor_protocol_event(QEVENT_POWERDOWN, NULL);