Commit 1c12e1f5 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

migration: move qemu_fclose to process_incoming_migration 



The common suffix is now just process_incoming_migration.

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

migration-exec.c

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ static void exec_accept_incoming_migration(void *opaque) 


    qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);

    process_incoming_migration(f);

    qemu_fclose(f);

}



void exec_start_incoming_migration(const char *command, Error **errp)

migration-fd.c

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static void fd_accept_incoming_migration(void *opaque) 


    qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);

    process_incoming_migration(f);

    qemu_fclose(f);

}



void fd_start_incoming_migration(const char *infd, Error **errp)

migration-tcp.c

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ static void tcp_accept_incoming_migration(void *opaque) 
    }



    process_incoming_migration(f);

    qemu_fclose(f);

    return;



out:

migration-unix.c

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ static void unix_accept_incoming_migration(void *opaque) 
    }



    process_incoming_migration(f);

    qemu_fclose(f);

    return;



out:

migration.c

+5 −1
Original line number Diff line number Diff line
@@ -85,7 +85,11 @@ void qemu_start_incoming_migration(const char *uri, Error **errp) 


void process_incoming_migration(QEMUFile *f)

{

    if (qemu_loadvm_state(f) < 0) {

    int ret;



    ret = qemu_loadvm_state(f);

    qemu_fclose(f);

    if (ret < 0) {

        fprintf(stderr, "load of migration failed\n");

        exit(0);

    }