From patchwork Wed Aug 3 15:17:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 108273 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 84751B71DE for ; Thu, 4 Aug 2011 01:18:41 +1000 (EST) Received: from localhost ([::1]:35129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodDJ-00079q-Py for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 11:18:29 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39734) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodCt-00065w-RI for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:18:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QodCi-0006cW-D0 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:17:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodCi-0006cJ-5X for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:17:52 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p73FHoi3001104 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Aug 2011 11:17:50 -0400 Received: from localhost (ovpn-113-124.phx2.redhat.com [10.3.113.124]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p73FHn4k006477; Wed, 3 Aug 2011 11:17:50 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 12:17:22 -0300 Message-Id: <1312384643-581-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1312384643-581-1-git-send-email-lcapitulino@redhat.com> References: <1312384643-581-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: blauwirbel@gmail.com, amit.shah@redhat.com, aliguori@us.ibm.com, jan.kiszka@web.de, avi@redhat.com Subject: [Qemu-devel] [PATCH 6/7] 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 be catastrophic: QSTATE_SHUTDOWN (when -no-shutdown is used) and QSTATE_INTERROR (which only happen with kvm). This commit fixes that by making system_reset mandatory before issuing cont in those states. Signed-off-by: Luiz Capitulino --- cpus.c | 4 ++++ monitor.c | 8 ++++++++ qerror.c | 4 ++++ qerror.h | 3 +++ sysemu.h | 2 +- vl.c | 1 + 6 files changed, 21 insertions(+), 1 deletions(-) diff --git a/cpus.c b/cpus.c index 65ea503..a61e658 100644 --- a/cpus.c +++ b/cpus.c @@ -125,6 +125,10 @@ static void do_vm_stop(QemuState state) pause_all_vcpus(); qemu_state_set(state); vm_state_notify(0, state); + if (state == QSTATE_INTERROR || state == QSTATE_SHUTDOWN) { + /* system_reset is required by 'cont' */ + system_reset_required = 1; + } qemu_aio_flush(); bdrv_flush_all(); monitor_protocol_event(QEVENT_STOP, NULL); diff --git a/monitor.c b/monitor.c index 3fa2cf7..f1cb5af 100644 --- a/monitor.c +++ b/monitor.c @@ -1312,7 +1312,14 @@ static int do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data) if (qemu_state_get() == QSTATE_INMIGRATE) { qerror_report(QERR_MIGRATION_EXPECTED); return -1; + } else if (qemu_state_get() == QSTATE_INTERROR || + qemu_state_get() == QSTATE_SHUTDOWN) { + if (system_reset_required) { + 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) { @@ -2014,6 +2021,7 @@ static int do_system_reset(Monitor *mon, const QDict *qdict, QObject **ret_data) { qemu_system_reset_request(); + system_reset_required = 0; return 0; } 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/sysemu.h b/sysemu.h index 46079ab..12a3f6a 100644 --- a/sysemu.h +++ b/sysemu.h @@ -30,7 +30,7 @@ typedef enum { } QemuState; extern const char *bios_name; - +extern int system_reset_required; extern const char *qemu_name; extern uint8_t qemu_uuid[]; int qemu_uuid_parse(const char *str, uint8_t *uuid); diff --git a/vl.c b/vl.c index 65cf4a5..7fad355 100644 --- a/vl.c +++ b/vl.c @@ -183,6 +183,7 @@ int mem_prealloc = 0; /* force preallocation of physical target memory */ #endif int nb_nics; NICInfo nd_table[MAX_NICS]; +int system_reset_required = 0; int autostart; static int rtc_utc = 1; static int rtc_date_offset = -1; /* -1 means no change */