From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSq4T-00021y-E7 for qemu-devel@nongnu.org; Mon, 29 Oct 2012 10:12:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSq4P-0007Ee-C1 for qemu-devel@nongnu.org; Mon, 29 Oct 2012 10:12:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSq4P-0007EY-2q for qemu-devel@nongnu.org; Mon, 29 Oct 2012 10:12:01 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9TEC0lR013053 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 29 Oct 2012 10:12:00 -0400 From: Juan Quintela Date: Mon, 29 Oct 2012 15:11:31 +0100 Message-Id: <1351519903-26607-7-git-send-email-quintela@redhat.com> In-Reply-To: <1351519903-26607-1-git-send-email-quintela@redhat.com> References: <1351519903-26607-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 06/18] migration: stop all cpus correctly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: owasserm@redhat.com, mtosatti@redhat.com, avi@redhat.com, pbonzini@redhat.com You can only stop all cpus from the iothread or an vcpu. As we want to do it from the migration_thread, we need to do this dance with the botton handlers. This patch is a request for ideas. I can move this function to cpus.c, but wondered if there is an easy way of doing this? Signed-off-by: Juan Quintela --- migration.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/migration.c b/migration.c index c39fa7e..d5c178d 100644 --- a/migration.c +++ b/migration.c @@ -20,6 +20,7 @@ #include "sysemu.h" #include "block.h" #include "qemu_socket.h" +#include "qemu-thread.h" #include "block-migration.h" #include "qmp-commands.h" @@ -319,11 +320,22 @@ ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, void migrate_fd_put_ready(MigrationState *s) { int ret; + static bool first_time = true; if (s->state != MIG_STATE_ACTIVE) { DPRINTF("put_ready returning because of non-active state\n"); return; } + if (first_time) { + first_time = false; + DPRINTF("beginning savevm\n"); + ret = qemu_savevm_state_begin(s->file, &s->params); + if (ret < 0) { + DPRINTF("failed, %d\n", ret); + migrate_fd_error(s); + return; + } + } DPRINTF("iterate\n"); ret = qemu_savevm_state_iterate(s->file); @@ -336,7 +348,11 @@ void migrate_fd_put_ready(MigrationState *s) DPRINTF("done iterating\n"); start_time = qemu_get_clock_ms(rt_clock); qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); - vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); + if (old_vm_running) { + vm_stop(RUN_STATE_FINISH_MIGRATE); + } else { + vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); + } if (qemu_savevm_state_complete(s->file) < 0) { migrate_fd_error(s); @@ -425,19 +441,8 @@ bool migration_has_failed(MigrationState *s) void migrate_fd_connect(MigrationState *s) { - int ret; - s->state = MIG_STATE_ACTIVE; qemu_fopen_ops_buffered(s); - - DPRINTF("beginning savevm\n"); - ret = qemu_savevm_state_begin(s->file, &s->params); - if (ret < 0) { - DPRINTF("failed, %d\n", ret); - migrate_fd_error(s); - return; - } - migrate_fd_put_ready(s); } static MigrationState *migrate_init(const MigrationParams *params) -- 1.7.11.7