diff options
| -rw-r--r-- | migration-exec.c | 2 | ||||
| -rw-r--r-- | migration-tcp.c | 3 | ||||
| -rw-r--r-- | vl.c | 4 |
3 files changed, 1 insertions, 8 deletions
diff --git a/migration-exec.c b/migration-exec.c index 0dd5aff315..e472979d8d 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -109,7 +109,6 @@ static void exec_accept_incoming_migration(void *opaque) QEMUFile *f = opaque; int ret; - vm_stop(0); /* just in case */ ret = qemu_loadvm_state(f); if (ret < 0) { fprintf(stderr, "load of migration failed\n"); @@ -119,7 +118,6 @@ 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); - vm_start(); err: qemu_fclose(f); diff --git a/migration-tcp.c b/migration-tcp.c index 1f4358ee5f..7a87a1edaf 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -155,7 +155,6 @@ static void tcp_accept_incoming_migration(void *opaque) goto out; } - vm_stop(0); /* just in case */ ret = qemu_loadvm_state(f); if (ret < 0) { fprintf(stderr, "load of migration failed\n"); @@ -168,8 +167,6 @@ static void tcp_accept_incoming_migration(void *opaque) qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); close(s); - vm_start(); - out_fopen: qemu_fclose(f); out: diff --git a/vl.c b/vl.c index 2fbea375ab..24173efefb 100644 --- a/vl.c +++ b/vl.c @@ -6070,10 +6070,8 @@ int main(int argc, char **argv, char **envp) if (loadvm) do_loadvm(cur_mon, loadvm); - if (incoming) { - autostart = 0; /* fixme how to deal with -daemonize */ + if (incoming) qemu_start_incoming_migration(incoming); - } if (autostart) vm_start(); |