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  <glommer@redhat.com>
Cc: Anthony Liguori  <aliguori@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Glauber Costa <glommer@redhat.com>

diff --git a/migration-exec.c b/migration-exec.c
index 2e7fdc21dd1d4023491ce954a7a53a6c913da72d..ade592eca06cee22feaa4d963157b1a1052b48bc 100644 (file)
--- 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 0875c23c985173568fea90d10795b510452ff245..5466e5755798127f59d86e11f10b1baa96df1b1c 100644 (file)
--- 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 57217c1ebcf850acdc94627d8ec0433c50d932e2..f549f29b94b99857e91e7615ff41a3e579130b44 100644 (file)
--- 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 0e4672785a164cdd892b68067a45dc84075c05c6..f1244c96eb4ccc8f69435fe9f22e0c7ae399d746 100644 (file)
--- 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) {