From patchwork Tue Oct 2 11:33:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 188483 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 C1DC12C00A9 for ; Tue, 2 Oct 2012 22:38:03 +1000 (EST) Received: from localhost ([::1]:50661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ0kX-0007NU-33 for incoming@patchwork.ozlabs.org; Tue, 02 Oct 2012 07:34:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ0jv-0006X0-21 for qemu-devel@nongnu.org; Tue, 02 Oct 2012 07:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJ0jo-0007hp-UR for qemu-devel@nongnu.org; Tue, 02 Oct 2012 07:34:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ0jo-0007gh-ME for qemu-devel@nongnu.org; Tue, 02 Oct 2012 07:34:08 -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 q92BY8Mx019702 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 2 Oct 2012 07:34:08 -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 q92BXbap001633; Tue, 2 Oct 2012 07:34:07 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 2 Oct 2012 13:33:17 +0200 Message-Id: <1349177616-5341-23-git-send-email-quintela@redhat.com> In-Reply-To: <1349177616-5341-1-git-send-email-quintela@redhat.com> References: <1349177616-5341-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 22/41] buffered_file: unfold migrate_fd_close 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 only used it once, just remove the callback indirection. Signed-off-by: Juan Quintela --- buffered_file.c | 7 ++----- buffered_file.h | 5 +---- migration.c | 8 ++------ migration.h | 1 + 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/buffered_file.c b/buffered_file.c index d257496..4fca774 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -23,7 +23,6 @@ typedef struct QEMUFileBuffered { - BufferedCloseFunc *close; MigrationState *migration_state; QEMUFile *file; int freeze_output; @@ -147,7 +146,7 @@ static int buffered_close(void *opaque) migrate_fd_wait_for_unfreeze(s->migration_state); } - ret = s->close(s->migration_state); + ret = migrate_fd_close(s->migration_state); qemu_del_timer(s->timer); qemu_free_timer(s->timer); @@ -224,8 +223,7 @@ static void buffered_rate_tick(void *opaque) } QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, - size_t bytes_per_sec, - BufferedCloseFunc *close) + size_t bytes_per_sec) { QEMUFileBuffered *s; @@ -233,7 +231,6 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, s->migration_state = migration_state; s->xfer_limit = bytes_per_sec / 10; - s->close = close; s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL, buffered_close, buffered_rate_limit, diff --git a/buffered_file.h b/buffered_file.h index 926e5c6..8a38754 100644 --- a/buffered_file.h +++ b/buffered_file.h @@ -17,10 +17,7 @@ #include "hw/hw.h" #include "migration.h" -typedef int (BufferedCloseFunc)(void *opaque); - QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, - size_t xfer_limit, - BufferedCloseFunc *close); + size_t xfer_limit); #endif diff --git a/migration.c b/migration.c index 30def68..f647a3f 100644 --- a/migration.c +++ b/migration.c @@ -392,10 +392,8 @@ void migrate_fd_wait_for_unfreeze(MigrationState *s) } } -static int migrate_fd_close(void *opaque) +int migrate_fd_close(MigrationState *s) { - MigrationState *s = opaque; - qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); return s->close(s); } @@ -431,9 +429,7 @@ void migrate_fd_connect(MigrationState *s) int ret; s->state = MIG_STATE_ACTIVE; - s->file = qemu_fopen_ops_buffered(s, - s->bandwidth_limit, - migrate_fd_close); + s->file = qemu_fopen_ops_buffered(s, s->bandwidth_limit); DPRINTF("beginning savevm\n"); ret = qemu_savevm_state_begin(s->file, &s->params); diff --git a/migration.h b/migration.h index d6341d6..ec022d6 100644 --- a/migration.h +++ b/migration.h @@ -82,6 +82,7 @@ ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, size_t size); void migrate_fd_put_ready(MigrationState *s); void migrate_fd_wait_for_unfreeze(MigrationState *s); +int migrate_fd_close(MigrationState *s); void add_migration_state_change_notifier(Notifier *notify); void remove_migration_state_change_notifier(Notifier *notify);