From patchwork Fri Sep 21 14:08:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 185749 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 B5F4B2C0080 for ; Sat, 22 Sep 2012 00:36:00 +1000 (EST) Received: from localhost ([::1]:39091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3wB-0004TP-Dc for incoming@patchwork.ozlabs.org; Fri, 21 Sep 2012 10:10:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3uM-0001qs-VI for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF3uF-0007Ks-Rc for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64184) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3uF-0007KZ-Jd for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:35 -0400 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 q8LE8Y0d027014 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 21 Sep 2012 10:08:35 -0400 Received: from trasno.mitica (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q8LE8LUm020823; Fri, 21 Sep 2012 10:08:33 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 21 Sep 2012 16:08:11 +0200 Message-Id: <1348236500-2565-6-git-send-email-quintela@redhat.com> In-Reply-To: <1348236500-2565-1-git-send-email-quintela@redhat.com> References: <1348236500-2565-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: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 05/14] migration: make qemu_fopen_ops_buffered() return void 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 We want the file assignment to happen before the thread is created to avoid locking, so we just do it before creating the thread. Signed-off-by: Juan Quintela --- buffered_file.c | 13 ++++++------- buffered_file.h | 2 +- migration.c | 2 +- migration.h | 1 + 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/buffered_file.c b/buffered_file.c index 61985a9..6c3d057 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -33,7 +33,6 @@ typedef struct QEMUFileBuffered size_t buffer_size; size_t buffer_capacity; QemuThread thread; - bool complete; } QEMUFileBuffered; #ifdef DEBUG_BUFFERED_FILE @@ -162,7 +161,7 @@ static int buffered_close(void *opaque) ret = ret2; } ret = migrate_fd_close(s->migration_state); - s->complete = true; + s->migration_state->complete = true; return ret; } @@ -224,7 +223,7 @@ static void *buffered_file_thread(void *opaque) while (true) { int64_t current_time = qemu_get_clock_ms(rt_clock); - if (s->complete) { + if (s->migration_state->complete) { break; } if (s->freeze_output) { @@ -247,7 +246,7 @@ static void *buffered_file_thread(void *opaque) return NULL; } -QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state) +void qemu_fopen_ops_buffered(MigrationState *migration_state) { QEMUFileBuffered *s; @@ -255,15 +254,15 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state) s->migration_state = migration_state; s->xfer_limit = migration_state->bandwidth_limit / 10; - s->complete = false; + s->migration_state->complete = false; s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL, buffered_close, buffered_rate_limit, buffered_set_rate_limit, buffered_get_rate_limit); + migration_state->file = s->file; + qemu_thread_create(&s->thread, buffered_file_thread, s, QEMU_THREAD_DETACHED); - - return s->file; } diff --git a/buffered_file.h b/buffered_file.h index ef010fe..8a246fd 100644 --- a/buffered_file.h +++ b/buffered_file.h @@ -17,6 +17,6 @@ #include "hw/hw.h" #include "migration.h" -QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state); +void qemu_fopen_ops_buffered(MigrationState *migration_state); #endif diff --git a/migration.c b/migration.c index 2c29d04..550c5c2 100644 --- a/migration.c +++ b/migration.c @@ -429,7 +429,7 @@ void migrate_fd_connect(MigrationState *s) int ret; s->state = MIG_STATE_ACTIVE; - s->file = qemu_fopen_ops_buffered(s); + qemu_fopen_ops_buffered(s); DPRINTF("beginning savevm\n"); ret = qemu_savevm_state_begin(s->file, &s->params); diff --git a/migration.h b/migration.h index 1c3e9b7..a63c5d5 100644 --- a/migration.h +++ b/migration.h @@ -45,6 +45,7 @@ struct MigrationState int64_t dirty_pages_rate; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; + bool complete; }; void process_incoming_migration(QEMUFile *f);