From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=59788 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OcMgP-0000LF-Ii for qemu-devel@nongnu.org; Fri, 23 Jul 2010 14:09:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OcMgN-0001Qb-72 for qemu-devel@nongnu.org; Fri, 23 Jul 2010 14:09:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44216) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OcMgM-0001QP-Tf for qemu-devel@nongnu.org; Fri, 23 Jul 2010 14:09:15 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6NI9Daf009854 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 23 Jul 2010 14:09:13 -0400 Date: Fri, 23 Jul 2010 15:08:18 -0300 From: Luiz Capitulino Message-ID: <20100723150818.69cde489@redhat.com> In-Reply-To: References: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH] migration: Issue 'cont' only on successful incoming migration List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amit Shah Cc: Paolo Bonzini , qemu list , laine@redhat.com, quintela@redhat.com On Fri, 23 Jul 2010 16:15:15 +0530 Amit Shah wrote: > 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. > > Reported-by: Laine Stump > Signed-off-by: Amit Shah > --- > migration.c | 3 +++ > monitor.c | 4 ++++ > sysemu.h | 1 + > vl.c | 3 +++ > 4 files changed, 11 insertions(+), 0 deletions(-) > > diff --git a/migration.c b/migration.c > index 650eb78..84d7e4a 100644 > --- a/migration.c > +++ b/migration.c > @@ -67,6 +67,9 @@ void process_incoming_migration(QEMUFile *f) > qemu_announce_self(); > DPRINTF("successfully loaded vm state\n"); > > + incoming_expected = false; > + incoming_done = true; > + > if (autostart) > vm_start(); > } > diff --git a/monitor.c b/monitor.c > index 45fd482..d12a7b5 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 && !incoming_done) { > + autostart = 1; Why do we need to set autostart? We should just fail if we're unable to run. > + return 1; /* Waiting for incoming migration */ You should return -1 and use qerror_report(), so that we have a meaningful error in the user Monitor and QMP (otherwise we'll get UndefinedError). And incomding_done is not needed. > + } > bdrv_iterate(encrypted_bdrv_it, &context); > /* only resume the vm if all keys are set and valid */ > if (!context.err) { > diff --git a/sysemu.h b/sysemu.h > index 9c988bb..f9c1962 100644 > --- a/sysemu.h > +++ b/sysemu.h > @@ -99,6 +99,7 @@ typedef enum DisplayType > } DisplayType; > > extern int autostart; > +extern int incoming_expected, incoming_done; > extern int bios_size; > > typedef enum { > diff --git a/vl.c b/vl.c > index ba6ee11..b69c11b 100644 > --- a/vl.c > +++ b/vl.c > @@ -182,6 +182,8 @@ int nb_nics; > NICInfo nd_table[MAX_NICS]; > int vm_running; > int autostart; > +int incoming_expected; /* Started with -incoming and waiting for incoming */ > +int incoming_done; /* Incoming migration successful */ > static int rtc_utc = 1; > static int rtc_date_offset = -1; /* -1 means no change */ > QEMUClock *rtc_clock; > @@ -2557,6 +2559,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;