Commit 6039dd5b authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert
Browse files

migration: Recover block devices if failure in device state 

In e91d8951 I added the new pause-before-switchover mechanism
to allow migration completion to be delayed; this changes the
last state prior to completion to MIGRATE_STATUS_DEVICE rather
than MIGRATE_STATUS_ACTIVE.

Fix the failure path in migration_completion to recover the block
devices if it fails in MIGRATE_STATUS_DEVICE, not just the
MIGRATE_STATUS_ACTIVE that it previously had.

This corresponds to rh bz:
  https://bugzilla.redhat.com/show_bug.cgi?id=1538494


whose symptom is an occasional source crash on a failed migration.

Fixes: e91d8951
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 6a7724e9

migration/migration.c

+2 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,8 @@ fail_invalidate: 
    /* If not doing postcopy, vm_start() will be called: let's regain

     * control on images.

     */

    if (s->state == MIGRATION_STATUS_ACTIVE) {

    if (s->state == MIGRATION_STATUS_ACTIVE ||

        s->state == MIGRATION_STATUS_DEVICE) {

        Error *local_err = NULL;



        qemu_mutex_lock_iothread();