From 2e450865338738300e529457879d81332939f064 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 3 Oct 2012 18:23:03 +0200 Subject: [PATCH] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect Signed-off-by: Juan Quintela --- include/migration/migration.h | 2 -- migration.c | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 2998dcc3b8..0c9bf8b482 100644 --- a/include/migration/migration.h +++ b/include/migration/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 diff --git a/migration.c b/migration.c index a38720112c..4a9f0b5041 100644 --- a/migration.c +++ b/migration.c @@ -371,13 +371,6 @@ bool migration_has_failed(MigrationState *s) s->state == MIG_STATE_ERROR); } -void migrate_fd_connect(MigrationState *s) -{ - s->state = MIG_STATE_ACTIVE; - s->first_time = true; - qemu_fopen_ops_buffered(s); -} - static MigrationState *migrate_init(const MigrationParams *params) { MigrationState *s = migrate_get_current(); @@ -803,10 +796,12 @@ static const QEMUFileOps buffered_file_ops = { .set_rate_limit = buffered_set_rate_limit, }; -void qemu_fopen_ops_buffered(MigrationState *migration_state) +void migrate_fd_connect(MigrationState *migration_state) { QEMUFileBuffered *s; + migration_state->state = MIG_STATE_ACTIVE; + migration_state->first_time = true; s = g_malloc0(sizeof(*s)); s->migration_state = migration_state; -- 2.11.0