From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MQiI7-0000n8-9r for qemu-devel@nongnu.org; Tue, 14 Jul 2009 09:43:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MQiI2-0000hU-OQ for qemu-devel@nongnu.org; Tue, 14 Jul 2009 09:43:31 -0400 Received: from [199.232.76.173] (port=53168 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MQiI2-0000h9-K3 for qemu-devel@nongnu.org; Tue, 14 Jul 2009 09:43:26 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40913) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MQiI1-0006OP-0R for qemu-devel@nongnu.org; Tue, 14 Jul 2009 09:43:25 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6EDhNWR010914 for ; Tue, 14 Jul 2009 09:43:23 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6EDhMqp003279 for ; Tue, 14 Jul 2009 09:43:22 -0400 Received: from localhost.localdomain (dhcp-lab-149.englab.brq.redhat.com [10.34.33.149]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6EDhLDY026586 for ; Tue, 14 Jul 2009 09:43:21 -0400 From: Paolo Bonzini Date: Tue, 14 Jul 2009 15:43:20 +0200 Message-Id: <1247579000-8535-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] 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, and we rely on this now that the vm_start is removed in migrate-*.c. So it's better to assert (!vm_running) instead. --- migration-exec.c | 3 +-- migration-tcp.c | 4 +--- vl.c | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/migration-exec.c b/migration-exec.c index 0dd5aff..5a111a0 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -109,7 +109,7 @@ static void exec_accept_incoming_migration(void *opaque) QEMUFile *f = opaque; int ret; - vm_stop(0); /* just in case */ + assert(!vm_running); /* just in case */ ret = qemu_loadvm_state(f); if (ret < 0) { fprintf(stderr, "load of migration failed\n"); @@ -119,7 +119,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..53897c3 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -155,7 +155,7 @@ static void tcp_accept_incoming_migration(void *opaque) goto out; } - vm_stop(0); /* just in case */ + assert(!vm_running); /* just in case */ ret = qemu_loadvm_state(f); if (ret < 0) { fprintf(stderr, "load of migration failed\n"); @@ -168,8 +168,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