From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZM-0005Jj-Il for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOkZL-0000fs-7b for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZL-0000fi-0E for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:03 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9I7V2Bq021774 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Oct 2012 03:31:02 -0400 From: Juan Quintela Date: Thu, 18 Oct 2012 09:30:14 +0200 Message-Id: <1350545426-23172-19-git-send-email-quintela@redhat.com> In-Reply-To: <1350545426-23172-1-git-send-email-quintela@redhat.com> References: <1350545426-23172-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 18/30] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- migration.c | 9 ++------- migration.h | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/migration.c b/migration.c index a99653e..1f783e1 100644 --- a/migration.c +++ b/migration.c @@ -345,12 +345,6 @@ bool migration_has_failed(MigrationState *s) s->state == MIG_STATE_ERROR); } -void migrate_fd_connect(MigrationState *s) -{ - s->state = MIG_STATE_ACTIVE; - qemu_fopen_ops_buffered(s); -} - static MigrationState *migrate_init(const MigrationParams *params) { MigrationState *s = migrate_get_current(); @@ -765,10 +759,11 @@ static void *buffered_file_thread(void *opaque) return NULL; } -void qemu_fopen_ops_buffered(MigrationState *migration_state) +void migrate_fd_connect(MigrationState *migration_state) { QEMUFileBuffered *s; + migration_state->state = MIG_STATE_ACTIVE; s = g_malloc0(sizeof(*s)); s->migration_state = migration_state; diff --git a/migration.h b/migration.h index f4c4d1e..60a2335 100644 --- a/migration.h +++ b/migration.h @@ -127,6 +127,4 @@ int migrate_use_xbzrle(void); int64_t migrate_xbzrle_cache_size(void); int64_t xbzrle_cache_resize(int64_t new_size); - -void qemu_fopen_ops_buffered(MigrationState *migration_state); #endif -- 1.7.11.7