Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- migration.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/migration.c b/migration.c index b32dfc1..8fb2d2e 100644 --- a/migration.c +++ b/migration.c @@ -273,10 +273,10 @@ static void migrate_fd_cleanup(void *opaque) qemu_thread_join(&s->thread); qemu_mutex_lock_iothread(); - migrate_fd_close(s); + qemu_fclose(s->file); + s->file = NULL; } - assert(s->file == NULL); assert(s->state != MIG_STATE_ACTIVE); if (s->state != MIG_STATE_COMPLETED) { @@ -301,16 +301,6 @@ static void migrate_fd_cancel(MigrationState *s) __sync_val_compare_and_swap(&s->state, MIG_STATE_ACTIVE, MIG_STATE_CANCELLED); } -int migrate_fd_close(MigrationState *s) -{ - int rc = 0; - if (s->file != NULL) { - rc = qemu_fclose(s->file); - s->file = NULL; - } - return rc; -} - void add_migration_state_change_notifier(Notifier *notify) { notifier_list_add(&migration_state_notifiers, notify); -- 1.7.1