diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2009-07-14 18:07:50 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-16 17:28:49 -0500 |
| commit | 89befdd1a6b18215153b8976682d57b7d03d5782 (patch) | |
| tree | 2345bfc739b2751c2f1653aca7ac132216d5f658 /migration-tcp.c | |
| parent | 8167ee883931cb20c6264fc19d040ce2dc6ceaaa (diff) | |
honor -S on incoming migration
-S is not honored by qemu on incoming migration. If a domain is migrated
while paused, thus, it will start running on the remote machine; this
is wrong.
Given the trivial patch to fix this, it looks more like a thinko
than anything else, probably dating back to the qemu-kvm merge.
The interesting part is that the -S mechanism was in fact *used* when
migrating (setting autostart = 0) and the incoming migration code was
starting the VM at the end of the migration.
Since I was removing the vm_start from there, I also corrected a related
imprecision. The code was doing a vm_stop "just in case", but we can
be sure that the VM is not running---the vm_start call in vl.c has not
been reached yet. So the vm_stop is removed together with the vm_start.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'migration-tcp.c')
| -rw-r--r-- | migration-tcp.c | 3 |
1 files changed, 0 insertions, 3 deletions
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: |