Commit 4cd327de authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180329a' into staging 



Migration pull (small fixes)

A pair of two small fixes for 2.12.

# gpg: Signature made Thu 29 Mar 2018 14:55:17 BST
# gpg:                using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20180329a:
  migration: Don't activate block devices if using -S
  migration: fix pfd leak

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 47d3b608 0746a926

migration/migration.c

+15 −7
Original line number Diff line number Diff line
@@ -306,6 +306,13 @@ static void process_incoming_migration_bh(void *opaque) 
    Error *local_err = NULL;

    MigrationIncomingState *mis = opaque;



    /* Only fire up the block code now if we're going to restart the

     * VM, else 'cont' will do it.

     * This causes file locking to happen; so we don't want it to happen

     * unless we really are starting the VM.

     */

    if (autostart && (!global_state_received() ||

        global_state_get_runstate() == RUN_STATE_RUNNING)) {

        /* Make sure all file formats flush their mutable metadata.

         * If we get an error here, just don't restart the VM yet. */

        bdrv_invalidate_cache_all(&local_err);
@@ -314,6 +321,7 @@ static void process_incoming_migration_bh(void *opaque) 
            local_err = NULL;

            autostart = false;

        }

    }



    /*

     * This must happen after all error conditions are dealt with and

migration/postcopy-ram.c

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

    }

    trace_postcopy_ram_fault_thread_exit();

    g_free(pfd);

    return NULL;

}