From 2b2c8310a60981dfe3bb37cdd007016f285d1b8a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 22 Feb 2013 17:36:46 +0100 Subject: [PATCH] migration: move contents of migration_close to migrate_fd_cleanup With this patch, the migration_file is not needed anymore. Reviewed-by: Orit Wasserman Reviewed-by: Juan Quintela Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela (cherry picked from commit 404a7c05bcc20c51fe1a9bf2deaeb4d6b658d3a3) --- migration.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/migration.c b/migration.c index ea84008..949a5bc 100644 --- a/migration.c +++ b/migration.c @@ -272,6 +272,12 @@ static void migrate_fd_cleanup(void *opaque) DPRINTF("closing file\n"); qemu_fclose(s->file); s->file = NULL; + + qemu_mutex_unlock_iothread(); + qemu_thread_join(&s->thread); + qemu_mutex_lock_iothread(); + + migrate_fd_close(s); } assert(s->migration_file == NULL); @@ -523,16 +529,7 @@ static int migration_put_buffer(void *opaque, const uint8_t *buf, static int migration_close(void *opaque) { - MigrationState *s = opaque; - - DPRINTF("closing\n"); - - qemu_mutex_unlock_iothread(); - qemu_thread_join(&s->thread); - qemu_mutex_lock_iothread(); - assert(s->state != MIG_STATE_ACTIVE); - - return migrate_fd_close(s); + return 0; } static int migration_get_fd(void *opaque)