projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unbreak ppc/prep
[qemu]
/
migration-tcp.c
diff --git
a/migration-tcp.c
b/migration-tcp.c
index
1f4358e
..
9ed92b4
100644
(file)
--- a/
migration-tcp.c
+++ b/
migration-tcp.c
@@
-155,7
+155,6
@@
static void tcp_accept_incoming_migration(void *opaque)
goto out;
}
goto out;
}
- vm_stop(0); /* just in case */
ret = qemu_loadvm_state(f);
if (ret < 0) {
fprintf(stderr, "load of migration failed\n");
ret = qemu_loadvm_state(f);
if (ret < 0) {
fprintf(stderr, "load of migration failed\n");
@@
-167,8
+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);
/* we've successfully migrated, close the server socket */
qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
close(s);
-
- vm_start();
+ if (autostart)
+ vm_start();
out_fopen:
qemu_fclose(f);
out_fopen:
qemu_fclose(f);