Commit 660819b1 authored by Peter Xu's avatar Peter Xu Committed by Juan Quintela
Browse files

migration: shut src return path unconditionally 



We were do the shutting off only for postcopy. Now we do this as long as
the source return path is there.

Moving the cleanup of from_src_file there too.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 3482655b

migration/migration.c

+7 −1
Original line number Diff line number Diff line
@@ -134,10 +134,17 @@ void migration_incoming_state_destroy(void) 
    struct MigrationIncomingState *mis = migration_incoming_get_current();



    if (mis->to_src_file) {

        /* Tell source that we are done */

        migrate_send_rp_shut(mis, qemu_file_get_error(mis->from_src_file) != 0);

        qemu_fclose(mis->to_src_file);

        mis->to_src_file = NULL;

    }



    if (mis->from_src_file) {

        qemu_fclose(mis->from_src_file);

        mis->from_src_file = NULL;

    }



    qemu_event_destroy(&mis->main_thread_load_event);

}
@@ -435,7 +442,6 @@ static void process_incoming_migration_co(void *opaque) 
        exit(EXIT_FAILURE);

    }



    qemu_fclose(f);

    free_xbzrle_decoded_buf();



    mis->bh = qemu_bh_new(process_incoming_migration_bh, mis);

migration/postcopy-ram.c

+0 −1
Original line number Diff line number Diff line
@@ -333,7 +333,6 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState *mis) 
    }



    postcopy_state_set(POSTCOPY_INCOMING_END);

    migrate_send_rp_shut(mis, qemu_file_get_error(mis->from_src_file) != 0);



    if (mis->postcopy_tmp_page) {

        munmap(mis->postcopy_tmp_page, mis->largest_page_size);