From 89befdd1a6b18215153b8976682d57b7d03d5782 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 14 Jul 2009 18:07:50 +0200 Subject: 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 Signed-off-by: Anthony Liguori --- migration-exec.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'migration-exec.c') 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); -- cgit v1.2.1