Commit 7de6a690 authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: move exit condition to migration thread 



Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>

Reviewed-by: default avatarReviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f7b67be3

migration.c

+8 −6
Original line number Diff line number Diff line
@@ -669,12 +669,6 @@ static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) 
    bool last_round = false;



    qemu_mutex_lock_iothread();

    if (s->state != MIG_STATE_ACTIVE) {

        DPRINTF("put_ready returning because of non-active state\n");

        qemu_mutex_unlock_iothread();

        return false;

    }



    DPRINTF("iterate\n");

    pending_size = qemu_savevm_state_pending(s->file, max_size);

    DPRINTF("pending size %lu max %lu\n", pending_size, max_size);
@@ -737,9 +731,17 @@ static void *buffered_file_thread(void *opaque) 
    while (true) {

        int64_t current_time = qemu_get_clock_ms(rt_clock);



        qemu_mutex_lock_iothread();

        if (s->state != MIG_STATE_ACTIVE) {

            DPRINTF("put_ready returning because of non-active state\n");

            qemu_mutex_unlock_iothread();

            break;

        }

        if (s->complete) {

            qemu_mutex_unlock_iothread();

            break;

        }

        qemu_mutex_unlock_iothread();

        if (current_time >= initial_time + BUFFER_DELAY) {

            uint64_t transferred_bytes = s->bytes_xfer;

            uint64_t time_spent = current_time - initial_time;