]> git.ipfire.org Git - thirdparty/qemu.git/commit
migration: Recover block devices if failure in device state
authorDr. David Alan Gilbert <dgilbert@redhat.com>
Mon, 5 Feb 2018 09:13:37 +0000 (09:13 +0000)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Mon, 12 Feb 2018 03:05:39 +0000 (21:05 -0600)
commitc8847f55656a26cef9a864689e75379410280d9b
tree7d80863e666e2b0ccb90f1c59b6c2c858af1c0ab
parentb9eec804f4624a59d7a7347117f8bb3354c078fd
migration: Recover block devices if failure in device state

In e91d895 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: e91d8951d59d483f085f
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
(cherry picked from commit 6039dd5b1c45d76403b9dcadd2afd7efd8f42330)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
migration/migration.c