From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MQkY1-0001BP-1z for qemu-devel@nongnu.org; Tue, 14 Jul 2009 12:08:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MQkXv-000123-MG for qemu-devel@nongnu.org; Tue, 14 Jul 2009 12:08:04 -0400 Received: from [199.232.76.173] (port=39656 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MQkXv-00011i-Il for qemu-devel@nongnu.org; Tue, 14 Jul 2009 12:07:59 -0400 Received: from mx2.redhat.com ([66.187.237.31]:50313) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MQkXu-0006Xb-UA for qemu-devel@nongnu.org; Tue, 14 Jul 2009 12:07:59 -0400 From: Paolo Bonzini Date: Tue, 14 Jul 2009 18:07:50 +0200 Message-Id: <1247587670-12901-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <4A5C9D41.9040907@codemonkey.ws> References: <4A5C9D41.9040907@codemonkey.ws> Subject: [Qemu-devel] [PATCH v2] honor -S on incoming migration List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org -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 --- > I'd suggest removing the asserts No objection from me. I adjusted the log message for this. migration-exec.c | 2 -- migration-tcp.c | 3 --- vl.c | 4 +--- 3 files changed, 1 insertions(+), 8 deletions(-) diff --git a/migration-exec.c b/migration-exec.c index 0dd5aff..e472979 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 1f4358e..7a87a1e 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 3242c23..845d185 100644 --- a/vl.c +++ b/vl.c @@ -6195,10 +6195,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(); -- 1.6.2.5