From d399f67704ddc29704e397b3e4f866a7c1052a3d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 27 Jul 2009 23:17:51 +0200 Subject: 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 --- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index bb56644e2f..fdd4f033a8 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 -- cgit v1.2.3