From patchwork Tue Jan 15 11:18:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 212111 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 F11D32C0082 for ; Tue, 15 Jan 2013 22:20:25 +1100 (EST) Received: from localhost ([::1]:40159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv4Z6-0006oS-1S for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 06:20:24 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv4XW-0004Aw-2Q for qemu-devel@nongnu.org; Tue, 15 Jan 2013 06:18:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv4XU-0001Cb-Rv for qemu-devel@nongnu.org; Tue, 15 Jan 2013 06:18:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:18639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv4XU-0001Bu-KA for qemu-devel@nongnu.org; Tue, 15 Jan 2013 06:18:44 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0FBIhFv023778 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 15 Jan 2013 06:18:44 -0500 Received: from trasno.mitica (ovpn-113-25.phx2.redhat.com [10.3.113.25]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0FBIMrD005333; Tue, 15 Jan 2013 06:18:42 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 15 Jan 2013 12:18:22 +0100 Message-Id: <1358248702-14278-15-git-send-email-quintela@redhat.com> In-Reply-To: <1358248702-14278-1-git-send-email-quintela@redhat.com> References: <1358248702-14278-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 14/14] Rename buffered_ to migration_ 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 This is consistent once that we have moved everything to migration.c Signed-off-by: Juan Quintela --- migration.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/migration.c b/migration.c index 77c1971..ac67525 100644 --- a/migration.c +++ b/migration.c @@ -522,7 +522,7 @@ int64_t migrate_xbzrle_cache_size(void) /* migration thread support */ -static ssize_t buffered_flush(MigrationState *s) +static ssize_t migration_flush(MigrationState *s) { size_t offset = 0; ssize_t ret = 0; @@ -552,7 +552,7 @@ static ssize_t buffered_flush(MigrationState *s) return offset; } -static int buffered_put_buffer(void *opaque, const uint8_t *buf, +static int migration_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, int size) { MigrationState *s = opaque; @@ -585,7 +585,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, return size; } -static int buffered_close(void *opaque) +static int migration_close(void *opaque) { MigrationState *s = opaque; ssize_t ret = 0; @@ -595,7 +595,7 @@ static int buffered_close(void *opaque) s->xfer_limit = INT_MAX; while (!qemu_file_get_error(s->file) && s->buffer_size) { - ret = buffered_flush(s); + ret = migration_flush(s); if (ret < 0) { break; } @@ -609,7 +609,7 @@ static int buffered_close(void *opaque) return ret; } -static int buffered_get_fd(void *opaque) +static int migration_get_fd(void *opaque) { MigrationState *s = opaque; @@ -622,7 +622,7 @@ static int buffered_get_fd(void *opaque) * 1: Time to stop * negative: There has been an error */ -static int buffered_rate_limit(void *opaque) +static int migration_rate_limit(void *opaque) { MigrationState *s = opaque; int ret; @@ -639,7 +639,7 @@ static int buffered_rate_limit(void *opaque) return 0; } -static int64_t buffered_set_rate_limit(void *opaque, int64_t new_rate) +static int64_t migration_set_rate_limit(void *opaque, int64_t new_rate) { MigrationState *s = opaque; if (qemu_file_get_error(s->file)) { @@ -655,14 +655,14 @@ out: return s->xfer_limit; } -static int64_t buffered_get_rate_limit(void *opaque) +static int64_t migration_get_rate_limit(void *opaque) { MigrationState *s = opaque; return s->xfer_limit; } -static void *buffered_file_thread(void *opaque) +static void *migration_file_thread(void *opaque) { MigrationState *s = opaque; int64_t initial_time = qemu_get_clock_ms(rt_clock); @@ -752,7 +752,7 @@ static void *buffered_file_thread(void *opaque) /* usleep expects microseconds */ g_usleep((initial_time + BUFFER_DELAY - current_time)*1000); } - ret = buffered_flush(s); + ret = migration_flush(s); if (ret < 0) { break; } @@ -766,13 +766,13 @@ out: return NULL; } -static const QEMUFileOps buffered_file_ops = { - .get_fd = buffered_get_fd, - .put_buffer = buffered_put_buffer, - .close = buffered_close, - .rate_limit = buffered_rate_limit, - .get_rate_limit = buffered_get_rate_limit, - .set_rate_limit = buffered_set_rate_limit, +static const QEMUFileOps migration_file_ops = { + .get_fd = migration_get_fd, + .put_buffer = migration_put_buffer, + .close = migration_close, + .rate_limit = migration_rate_limit, + .get_rate_limit = migration_get_rate_limit, + .set_rate_limit = migration_set_rate_limit, }; void migrate_fd_connect(MigrationState *s) @@ -786,9 +786,9 @@ void migrate_fd_connect(MigrationState *s) s->xfer_limit = s->bandwidth_limit / XFER_LIMIT_RATIO; s->complete = false; - s->file = qemu_fopen_ops(s, &buffered_file_ops); + s->file = qemu_fopen_ops(s, &migration_file_ops); - qemu_thread_create(&s->thread, buffered_file_thread, s, + qemu_thread_create(&s->thread, migration_file_thread, s, QEMU_THREAD_DETACHED); notifier_list_notify(&migration_state_notifiers, s); }