Commit 404a7c05 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Juan Quintela
Browse files

migration: move contents of migration_close to migrate_fd_cleanup 



With this patch, the migration_file is not needed anymore.

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 1964a397

migration.c

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