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

migration: eliminate s->migration_file 



The indirection is useless now.  Backends can open s->file directly.

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 404a7c05

include/migration/migration.h

+0 −2
Original line number Diff line number Diff line
@@ -36,9 +36,7 @@ struct MigrationState 
    size_t xfer_limit;

    QemuThread thread;

    QEMUBH *cleanup_bh;



    QEMUFile *file;

    QEMUFile *migration_file;



    int state;

    MigrationParams params;

migration-exec.c

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 


void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp)

{

    s->migration_file = qemu_popen_cmd(command, "w");

    if (s->migration_file == NULL) {

    s->file = qemu_popen_cmd(command, "w");

    if (s->file == NULL) {

        error_setg_errno(errp, errno, "failed to popen the migration target");

        return;

    }

migration-fd.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error ** 
    if (fd == -1) {

        return;

    }

    s->migration_file = qemu_fdopen(fd, "wb");

    s->file = qemu_fdopen(fd, "wb");



    migrate_fd_connect(s);

}

migration-tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ static void tcp_wait_for_connect(int fd, void *opaque) 


    if (fd < 0) {

        DPRINTF("migrate connect error\n");

        s->migration_file = NULL;

        s->file = NULL;

        migrate_fd_error(s);

    } else {

        DPRINTF("migrate connect success\n");

        s->migration_file = qemu_fopen_socket(fd, "wb");

        s->file = qemu_fopen_socket(fd, "wb");

        migrate_fd_connect(s);

    }

}

migration-unix.c

+2 −2
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ static void unix_wait_for_connect(int fd, void *opaque) 


    if (fd < 0) {

        DPRINTF("migrate connect error\n");

        s->migration_file = NULL;

        s->file = NULL;

        migrate_fd_error(s);

    } else {

        DPRINTF("migrate connect success\n");

        s->migration_file = qemu_fopen_socket(fd, "wb");

        s->file = qemu_fopen_socket(fd, "wb");

        migrate_fd_connect(s);

    }

}