From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MVXa9-0007ew-9y for qemu-devel@nongnu.org; Mon, 27 Jul 2009 17:18:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MVXa4-0007e1-LG for qemu-devel@nongnu.org; Mon, 27 Jul 2009 17:18:04 -0400 Received: from [199.232.76.173] (port=58955 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MVXa4-0007dy-Gr for qemu-devel@nongnu.org; Mon, 27 Jul 2009 17:18:00 -0400 Received: from mx2.redhat.com ([66.187.237.31]:42502) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MVXa3-000512-TS for qemu-devel@nongnu.org; Mon, 27 Jul 2009 17:18:00 -0400 From: Paolo Bonzini Date: Mon, 27 Jul 2009 23:17:51 +0200 Message-Id: <1248729471-5403-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <20090727201855.GK4776@poweredge.glommer> References: <20090727201855.GK4776@poweredge.glommer> Subject: [Qemu-devel] [PATCH alternative] fix migration to obey -S List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Glauber Costa , Anthony Liguori 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 --- This implements the other semantics that glommer also agreed were nice to have. 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 e472979..6249b93 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -118,6 +118,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 7a87a1e..d3feb85 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -166,6 +166,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 fe24415..9ab346c 100644 --- a/sysemu.h +++ b/sysemu.h @@ -102,6 +102,7 @@ typedef enum DisplayType DT_NOGRAPHIC, } DisplayType; +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 845d185..02a8cd4 100644 --- a/vl.c +++ b/vl.c @@ -210,7 +210,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; @@ -6198,7 +6198,7 @@ int main(int argc, char **argv, char **envp) if (incoming) qemu_start_incoming_migration(incoming); - if (autostart) + else if (autostart) vm_start(); #ifndef _WIN32