From patchwork Wed Dec 19 12:33:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 207369 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 EEA4D2C0085 for ; Thu, 20 Dec 2012 01:46:26 +1100 (EST) Received: from localhost ([::1]:37133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlKuf-0003pQ-57 for incoming@patchwork.ozlabs.org; Wed, 19 Dec 2012 09:46:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlIrI-0004za-Ai for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlIrG-0004RN-K9 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlIrG-0004RE-Cy for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:46 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBJCYjwG015534 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Dec 2012 07:34:45 -0500 Received: from trasno.mitica (ovpn-113-59.phx2.redhat.com [10.3.113.59]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBJCXwuw027690; Wed, 19 Dec 2012 07:34:44 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 19 Dec 2012 13:33:57 +0100 Message-Id: <1355920437-29882-35-git-send-email-quintela@redhat.com> In-Reply-To: <1355920437-29882-1-git-send-email-quintela@redhat.com> References: <1355920437-29882-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini Subject: [Qemu-devel] [PATCH 34/34] migration: merge QEMUFileBuffered into MigrationState 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 Avoid splitting the state of outgoing migration, more or less arbitrarily, between two data structures. QEMUFileBuffered anyway is used only during migration. Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela --- migration.c | 63 ++++++++++++++++++++++++------------------------------------- migration.h | 8 ++++++++ 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/migration.c b/migration.c index ca39564..1d7ffb2 100644 --- a/migration.c +++ b/migration.c @@ -521,18 +521,8 @@ int64_t migrate_xbzrle_cache_size(void) /* migration thread support */ -typedef struct QEMUFileBuffered { - MigrationState *migration_state; - QEMUFile *file; - size_t bytes_xfer; - size_t xfer_limit; - uint8_t *buffer; - size_t buffer_size; - size_t buffer_capacity; - QemuThread thread; -} QEMUFileBuffered; - -static ssize_t buffered_flush(QEMUFileBuffered *s) + +static ssize_t buffered_flush(MigrationState *s) { size_t offset = 0; ssize_t ret = 0; @@ -541,8 +531,7 @@ static ssize_t buffered_flush(QEMUFileBuffered *s) while (s->bytes_xfer < s->xfer_limit && offset < s->buffer_size) { size_t to_send = MIN(s->buffer_size - offset, s->xfer_limit - s->bytes_xfer); - ret = migrate_fd_put_buffer(s->migration_state, s->buffer + offset, - to_send); + ret = migrate_fd_put_buffer(s, s->buffer + offset, to_send); if (ret <= 0) { DPRINTF("error flushing data, %zd\n", ret); break; @@ -566,7 +555,7 @@ static ssize_t buffered_flush(QEMUFileBuffered *s) static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, int size) { - QEMUFileBuffered *s = opaque; + MigrationState *s = opaque; ssize_t error; DPRINTF("putting %d bytes at %" PRId64 "\n", size, pos); @@ -598,7 +587,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, static int buffered_close(void *opaque) { - QEMUFileBuffered *s = opaque; + MigrationState *s = opaque; ssize_t ret = 0; int ret2; @@ -612,20 +601,20 @@ static int buffered_close(void *opaque) } } - ret2 = migrate_fd_close(s->migration_state); + ret2 = migrate_fd_close(s); if (ret >= 0) { ret = ret2; } - ret = migrate_fd_close(s->migration_state); - s->migration_state->complete = true; + ret = migrate_fd_close(s); + s->complete = true; return ret; } static int buffered_get_fd(void *opaque) { - QEMUFileBuffered *s = opaque; + MigrationState *s = opaque; - return s->migration_state->fd; + return s->fd; } /* @@ -636,7 +625,7 @@ static int buffered_get_fd(void *opaque) */ static int buffered_rate_limit(void *opaque) { - QEMUFileBuffered *s = opaque; + MigrationState *s = opaque; int ret; ret = qemu_file_get_error(s->file); @@ -653,7 +642,7 @@ static int buffered_rate_limit(void *opaque) static int64_t buffered_set_rate_limit(void *opaque, int64_t new_rate) { - QEMUFileBuffered *s = opaque; + MigrationState *s = opaque; if (qemu_file_get_error(s->file)) { goto out; } @@ -669,7 +658,7 @@ out: static int64_t buffered_get_rate_limit(void *opaque) { - QEMUFileBuffered *s = opaque; + MigrationState *s = opaque; return s->xfer_limit; } @@ -741,7 +730,7 @@ static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) static void *buffered_file_thread(void *opaque) { - QEMUFileBuffered *s = opaque; + MigrationState *s = opaque; int64_t initial_time = qemu_get_clock_ms(rt_clock); int64_t max_size = 0; bool last_round = false; @@ -749,7 +738,7 @@ static void *buffered_file_thread(void *opaque) while (true) { int64_t current_time = qemu_get_clock_ms(rt_clock); - if (s->migration_state->complete) { + if (s->complete) { break; } if (current_time >= initial_time + BUFFER_DELAY) { @@ -776,12 +765,11 @@ 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(s, max_size); } } g_free(s->buffer); - g_free(s); return NULL; } @@ -794,22 +782,21 @@ static const QEMUFileOps buffered_file_ops = { .set_rate_limit = buffered_set_rate_limit, }; -void migrate_fd_connect(MigrationState *migration_state) +void migrate_fd_connect(MigrationState *s) { - QEMUFileBuffered *s; + s->state = MIG_STATE_ACTIVE; + s->bytes_xfer = 0; + s->buffer = NULL; + s->buffer_size = 0; + s->buffer_capacity = 0; - migration_state->state = MIG_STATE_ACTIVE; - migration_state->first_time = true; - s = g_malloc0(sizeof(*s)); + s->first_time = true; - s->migration_state = migration_state; - s->xfer_limit = s->migration_state->bandwidth_limit / XFER_LIMIT_RATIO; - s->migration_state->complete = false; + s->xfer_limit = s->bandwidth_limit / XFER_LIMIT_RATIO; + s->complete = false; s->file = qemu_fopen_ops(s, &buffered_file_ops); - migration_state->file = s->file; - qemu_thread_create(&s->thread, buffered_file_thread, s, QEMU_THREAD_DETACHED); notifier_list_notify(&migration_state_notifiers, s); diff --git a/migration.h b/migration.h index 542197e..1b344d5 100644 --- a/migration.h +++ b/migration.h @@ -16,6 +16,7 @@ #include "qdict.h" #include "qemu-common.h" +#include "qemu-thread.h" #include "notify.h" #include "error.h" #include "vmstate.h" @@ -31,6 +32,13 @@ typedef struct MigrationState MigrationState; struct MigrationState { int64_t bandwidth_limit; + size_t bytes_xfer; + size_t xfer_limit; + uint8_t *buffer; + size_t buffer_size; + size_t buffer_capacity; + QemuThread thread; + QEMUFile *file; int fd; int state;