diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2009-07-27 23:17:51 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-30 09:50:36 -0500 |
| commit | d399f67704ddc29704e397b3e4f866a7c1052a3d (patch) | |
| tree | bd1cc6f856a64bf95bc0578b71f150ed05b72350 | |
| parent | 866358211d8398823e72528daaa810eef49be8c5 (diff) | |
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>
| -rw-r--r-- | migration-exec.c | 2 | ||||
| -rw-r--r-- | migration-tcp.c | 2 | ||||
| -rw-r--r-- | sysemu.h | 1 | ||||
| -rw-r--r-- | vl.c | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/migration-exec.c b/migration-exec.c index e472979d8d..e3616be5f1 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 7a87a1edaf..9ed92b4427 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); @@ -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; @@ -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 |