From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiPFS-0006Yh-90 for qemu-devel@nongnu.org; Tue, 11 Dec 2012 07:47:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TiPFM-0004Ru-Cl for qemu-devel@nongnu.org; Tue, 11 Dec 2012 07:47:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiPFM-0004Rk-6B for qemu-devel@nongnu.org; Tue, 11 Dec 2012 07:47:40 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBBCldD6027425 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 11 Dec 2012 07:47:39 -0500 From: Juan Quintela Date: Tue, 11 Dec 2012 13:46:58 +0100 Message-Id: <1355230031-28233-23-git-send-email-quintela@redhat.com> In-Reply-To: <1355230031-28233-1-git-send-email-quintela@redhat.com> References: <1355230031-28233-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 22/35] migration: move exit condition to migration thread List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- migration.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/migration.c b/migration.c index 031302b..5c2f413 100644 --- a/migration.c +++ b/migration.c @@ -676,12 +676,6 @@ static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) bool last_round = false; qemu_mutex_lock_iothread(); - if (s->state != MIG_STATE_ACTIVE) { - DPRINTF("put_ready returning because of non-active state\n"); - qemu_mutex_unlock_iothread(); - return false; - } - DPRINTF("iterate\n"); pending_size = qemu_savevm_state_pending(s->file, max_size); DPRINTF("pending size %lu max %lu\n", pending_size, max_size); @@ -748,9 +742,18 @@ static void *buffered_file_thread(void *opaque) while (true) { int64_t current_time = qemu_get_clock_ms(rt_clock); - if (s->migration_state->complete) { + qemu_mutex_lock_iothread(); + if (m->state != MIG_STATE_ACTIVE) { + DPRINTF("put_ready returning because of non-active state\n"); + qemu_mutex_unlock_iothread(); break; } + if (m->complete) { + qemu_mutex_unlock_iothread(); + break; + } + qemu_mutex_unlock_iothread(); + if (current_time >= initial_time + BUFFER_DELAY) { uint64_t transferred_bytes = s->bytes_xfer; uint64_t time_spent = current_time - initial_time; -- 1.7.11.7