From patchwork Wed Aug 26 13:05:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 32161 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 2AEE8B70AD for ; Thu, 27 Aug 2009 03:16:32 +1000 (EST) Received: from localhost ([127.0.0.1]:58347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgM6m-0006tu-Ev for incoming@patchwork.ozlabs.org; Wed, 26 Aug 2009 13:16:28 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgLwc-0002KF-6J for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:05:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgLwX-0002D7-H5 for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:05:57 -0400 Received: from [199.232.76.173] (port=45780 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgLwX-0002Ch-BQ for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:05:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1026) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgLwW-0000Xa-OE for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:05:53 -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 n7QH5pUk031701; Wed, 26 Aug 2009 13:05:52 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7QH5kJp009197; Wed, 26 Aug 2009 13:05:51 -0400 From: Glauber Costa To: qemu-devel@nongnu.org Date: Wed, 26 Aug 2009 09:05:40 -0400 Message-Id: <1251291946-25821-7-git-send-email-glommer@redhat.com> In-Reply-To: <1251291946-25821-6-git-send-email-glommer@redhat.com> References: <1251291946-25821-1-git-send-email-glommer@redhat.com> <1251291946-25821-2-git-send-email-glommer@redhat.com> <1251291946-25821-3-git-send-email-glommer@redhat.com> <1251291946-25821-4-git-send-email-glommer@redhat.com> <1251291946-25821-5-git-send-email-glommer@redhat.com> <1251291946-25821-6-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Paolo Bonzini , aliguori@us.ibm.com, Glauber Costa Subject: [Qemu-devel] [PATCH 06/12] fix migration to obey -S 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: Paolo Bonzini Since migration returns right away, starting the VM right after calling qemu_start_incoming_migration is wrong even if -S is not passed. We have to do this after migration has completed. Cc: Glauber Costa Cc: Anthony Liguori Signed-off-by: Anthony Liguori Signed-off-by: Glauber Costa --- migration-exec.c | 2 ++ migration-tcp.c | 2 ++ sysemu.h | 1 + vl.c | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/migration-exec.c b/migration-exec.c index 2e7fdc2..ade592e 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -122,6 +122,8 @@ static void exec_accept_incoming_migration(void *opaque) dprintf("successfully loaded vm state\n"); /* we've successfully migrated, close the fd */ qemu_set_fd_handler2(qemu_popen_fd(f), NULL, NULL, NULL, NULL); + if (autostart) + vm_start(); err: qemu_fclose(f); diff --git a/migration-tcp.c b/migration-tcp.c index 0875c23..5466e57 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -170,6 +170,8 @@ static void tcp_accept_incoming_migration(void *opaque) /* we've successfully migrated, close the server socket */ qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); close(s); + if (autostart) + vm_start(); out_fopen: qemu_fclose(f); diff --git a/sysemu.h b/sysemu.h index 57217c1..f549f29 100644 --- a/sysemu.h +++ b/sysemu.h @@ -77,6 +77,7 @@ int tap_win32_init(VLANState *vlan, const char *model, /* SLIRP */ void do_info_slirp(void); +extern int autostart; extern int bios_size; extern int cirrus_vga_enabled; extern int std_vga_enabled; diff --git a/vl.c b/vl.c index 0e46727..f1244c9 100644 --- a/vl.c +++ b/vl.c @@ -201,7 +201,7 @@ ram_addr_t ram_size; int nb_nics; NICInfo nd_table[MAX_NICS]; int vm_running; -static int autostart; +int autostart; static int rtc_utc = 1; static int rtc_date_offset = -1; /* -1 means no change */ int cirrus_vga_enabled = 1; @@ -5726,7 +5726,7 @@ int main(int argc, char **argv, char **envp) qemu_start_incoming_migration(incoming); } - if (autostart) + else if (autostart) vm_start(); if (daemonize) {