Commit 6f190a06 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Juan Quintela
Browse files

migration: inline migrate_fd_close 



Reviewed-by: default avatarOrit Wasserman <owasserm@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent b352365f

migration.c

+2 −12
Original line number Diff line number Diff line
@@ -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);