Commit a26ba26e authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Amit Shah
Browse files

migration_cancel: shutdown migration socket 



Force shutdown on migration socket on cancel to cause the cancel
to complete even if the socket is blocked on a dead network.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
parent 131fe9b8

migration/migration.c

+12 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ void migrate_fd_error(MigrationState *s) 
static void migrate_fd_cancel(MigrationState *s)

{

    int old_state ;

    QEMUFile *f = migrate_get_current()->file;

    trace_migrate_fd_cancel();



    do {
@@ -339,6 +340,17 @@ static void migrate_fd_cancel(MigrationState *s) 
        }

        migrate_set_state(s, old_state, MIG_STATE_CANCELLING);

    } while (s->state != MIG_STATE_CANCELLING);



    /*

     * If we're unlucky the migration code might be stuck somewhere in a

     * send/write while the network has failed and is waiting to timeout;

     * if we've got shutdown(2) available then we can force it to quit.

     * The outgoing qemu file gets closed in migrate_fd_cleanup that is

     * called in a bh, so there is no race against this cancel.

     */

    if (s->state == MIG_STATE_CANCELLING && f) {

        qemu_file_shutdown(f);

    }

}



void add_migration_state_change_notifier(Notifier *notify)