From patchwork Thu Aug 19 13:18:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 62157 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 679A0B70E5 for ; Thu, 19 Aug 2010 23:26:21 +1000 (EST) Received: from localhost ([127.0.0.1]:48857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Om58L-0003cJ-TG for incoming@patchwork.ozlabs.org; Thu, 19 Aug 2010 09:26:17 -0400 Received: from [140.186.70.92] (port=40083 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Om51b-00081t-8v for qemu-devel@nongnu.org; Thu, 19 Aug 2010 09:19:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Om51Z-00010L-4I for qemu-devel@nongnu.org; Thu, 19 Aug 2010 09:19:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11245) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Om51Y-000104-Ta for qemu-devel@nongnu.org; Thu, 19 Aug 2010 09:19:17 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7JDJ2a3023618 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 19 Aug 2010 09:19:03 -0400 Received: from localhost (ovpn-113-87.phx2.redhat.com [10.3.113.87]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7JDJ189010442; Thu, 19 Aug 2010 09:19:02 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Thu, 19 Aug 2010 10:18:41 -0300 Message-Id: <1282223922-5971-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1282223922-5971-1-git-send-email-lcapitulino@redhat.com> References: <1282223922-5971-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , qemu-devel@nongnu.org, Aurelien Jarno Subject: [Qemu-devel] [PATCH 3/4] migration: Accept 'cont' only after successful incoming migration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Amit Shah When a 'cont' is issued on a VM that's just waiting for an incoming migration, the VM reboots and boots into the guest, possibly corrupting its storage since it could be shared with another VM running elsewhere. Ensure that a VM started with '-incoming' is only run when an incoming migration successfully completes. A new qerror, QERR_MIGRATION_EXPECTED, is added to signal that 'cont' failed due to no incoming migration has been attempted yet. Reported-by: Laine Stump Signed-off-by: Amit Shah Reviewed-by: Luiz Capitulino Signed-off-by: Aurelien Jarno --- migration.c | 2 ++ monitor.c | 4 ++++ qerror.c | 4 ++++ qerror.h | 3 +++ sysemu.h | 1 + vl.c | 2 ++ 6 files changed, 16 insertions(+), 0 deletions(-) diff --git a/migration.c b/migration.c index dbb8fd6..468d517 100644 --- a/migration.c +++ b/migration.c @@ -67,6 +67,8 @@ void process_incoming_migration(QEMUFile *f) qemu_announce_self(); DPRINTF("successfully loaded vm state\n"); + incoming_expected = false; + if (autostart) vm_start(); } diff --git a/monitor.c b/monitor.c index 45fd482..5366c36 100644 --- a/monitor.c +++ b/monitor.c @@ -1056,6 +1056,10 @@ static int do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data) { struct bdrv_iterate_context context = { mon, 0 }; + if (incoming_expected) { + qerror_report(QERR_MIGRATION_EXPECTED); + 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 2f6f590..0af3ab3 100644 --- a/qerror.c +++ b/qerror.c @@ -141,6 +141,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "Using KVM without %(capability), %(feature) unavailable", }, { + .error_fmt = QERR_MIGRATION_EXPECTED, + .desc = "An incoming migration is expected before this command can be executed", + }, + { .error_fmt = QERR_MISSING_PARAMETER, .desc = "Parameter '%(name)' is missing", }, diff --git a/qerror.h b/qerror.h index 9ad00b4..62802ea 100644 --- a/qerror.h +++ b/qerror.h @@ -121,6 +121,9 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_KVM_MISSING_CAP \ "{ 'class': 'KVMMissingCap', 'data': { 'capability': %s, 'feature': %s } }" +#define QERR_MIGRATION_EXPECTED \ + "{ 'class': 'MigrationExpected', 'data': {} }" + #define QERR_MISSING_PARAMETER \ "{ 'class': 'MissingParameter', 'data': { 'name': %s } }" diff --git a/sysemu.h b/sysemu.h index 9c988bb..a1f6466 100644 --- a/sysemu.h +++ b/sysemu.h @@ -99,6 +99,7 @@ typedef enum DisplayType } DisplayType; extern int autostart; +extern int incoming_expected; extern int bios_size; typedef enum { diff --git a/vl.c b/vl.c index ba6ee11..c2e7cc1 100644 --- a/vl.c +++ b/vl.c @@ -182,6 +182,7 @@ int nb_nics; NICInfo nd_table[MAX_NICS]; int vm_running; int autostart; +int incoming_expected; /* Started with -incoming and waiting for incoming */ static int rtc_utc = 1; static int rtc_date_offset = -1; /* -1 means no change */ QEMUClock *rtc_clock; @@ -2557,6 +2558,7 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_incoming: incoming = optarg; + incoming_expected = true; break; case QEMU_OPTION_nodefaults: default_serial = 0;