diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-22 17:36:48 +0100 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2013-03-11 13:32:03 +0100 |
commit | 6f190a0641f5b06a462b62955c15c77b8fb3990c (patch) | |
tree | 78b533120afbb508f87fae91c4f5d12185810f93 /migration.c | |
parent | b352365f5abec075dede0222f1bc37674d64117c (diff) | |
download | qemu-6f190a0641f5b06a462b62955c15c77b8fb3990c.zip qemu-6f190a0641f5b06a462b62955c15c77b8fb3990c.tar.gz qemu-6f190a0641f5b06a462b62955c15c77b8fb3990c.tar.bz2 |
migration: inline migrate_fd_close
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration.c')
-rw-r--r-- | migration.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/migration.c b/migration.c index 5d048ef..185d112 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); |