From 6f190a0641f5b06a462b62955c15c77b8fb3990c Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 22 Feb 2013 17:36:48 +0100 Subject: [PATCH] migration: inline migrate_fd_close Reviewed-by: Orit Wasserman Reviewed-by: Juan Quintela Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela --- migration.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/migration.c b/migration.c index 5d048ef74c..185d11260d 100644 --- a/migration.c +++ b/migration.c @@ -274,10 +274,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) { @@ -311,16 +311,6 @@ static void migrate_fd_cancel(MigrationState *s) migrate_finish_set_state(s, 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);