From patchwork Tue Dec 11 12:46:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 205242 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B9DDB2C008A for ; Wed, 12 Dec 2012 01:24:52 +1100 (EST) Received: from localhost ([::1]:34025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiPHS-0001bK-DP for incoming@patchwork.ozlabs.org; Tue, 11 Dec 2012 07:49:50 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiPFT-0006dK-Rk for qemu-devel@nongnu.org; Tue, 11 Dec 2012 07:47:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TiPFK-0004R7-45 for qemu-devel@nongnu.org; Tue, 11 Dec 2012 07:47:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10674) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiPFJ-0004Qw-R0 for qemu-devel@nongnu.org; Tue, 11 Dec 2012 07:47:38 -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 qBBClbUV004593 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 11 Dec 2012 07:47:37 -0500 Received: from trasno.mitica (ovpn-113-46.phx2.redhat.com [10.3.113.46]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qBBClCVk027513; Tue, 11 Dec 2012 07:47:36 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 11 Dec 2012 13:46:56 +0100 Message-Id: <1355230031-28233-21-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 20/35] migration: move begining stage to the migration thread X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- migration.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/migration.c b/migration.c index 913f3bc..336941b 100644 --- a/migration.c +++ b/migration.c @@ -672,7 +672,6 @@ static int64_t buffered_get_rate_limit(void *opaque) static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) { int ret; - static bool first_time = true; uint64_t pending_size; bool last_round = false; @@ -682,17 +681,6 @@ static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) qemu_mutex_unlock_iothread(); return false; } - 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); - qemu_mutex_unlock_iothread(); - return false; - } - } DPRINTF("iterate\n"); pending_size = qemu_savevm_state_pending(s->file, max_size); @@ -741,9 +729,21 @@ static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) static void *buffered_file_thread(void *opaque) { QEMUFileBuffered *s = opaque; + MigrationState *m = s->migration_state; int64_t initial_time = qemu_get_clock_ms(rt_clock); int64_t max_size = 0; bool last_round = false; + int ret; + + qemu_mutex_lock_iothread(); + DPRINTF("beginning savevm\n"); + ret = qemu_savevm_state_begin(m->file, &m->params); + if (ret < 0) { + DPRINTF("failed, %d\n", ret); + qemu_mutex_unlock_iothread(); + goto out; + } + qemu_mutex_unlock_iothread(); while (true) { int64_t current_time = qemu_get_clock_ms(rt_clock); @@ -775,10 +775,14 @@ static void *buffered_file_thread(void *opaque) DPRINTF("file is ready\n"); if (s->bytes_xfer < s->xfer_limit) { DPRINTF("notifying client\n"); - last_round = migrate_fd_put_ready(s->migration_state, max_size); + last_round = migrate_fd_put_ready(m, max_size); } } +out: + if (ret < 0) { + migrate_fd_error(m); + } g_free(s->buffer); g_free(s); return NULL;