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 /vl.c | |
| parent | 866358211d8398823e72528daaa810eef49be8c5 (diff) | |
| download | qemu-d399f67704ddc29704e397b3e4f866a7c1052a3d.tar.gz qemu-d399f67704ddc29704e397b3e4f866a7c1052a3d.tar.bz2 qemu-d399f67704ddc29704e397b3e4f866a7c1052a3d.zip | |
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>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |