From d399f67704ddc29704e397b3e4f866a7c1052a3d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 27 Jul 2009 23:17:51 +0200 Subject: [PATCH] fix migration to obey -S 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 --- 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..e3616be 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..9ed92b4 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 96928dc..6af88d8 100644 --- a/sysemu.h +++ b/sysemu.h @@ -104,6 +104,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 bb56644..fdd4f03 100644 --- a/vl.c +++ b/vl.c @@ -187,7 +187,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; @@ -6091,7 +6091,7 @@ int main(int argc, char **argv, char **envp) qemu_start_incoming_migration(incoming); } - if (autostart) + else if (autostart) vm_start(); #ifndef _WIN32 -- 1.7.9.5