Revision c8847f55656a26cef9a864689e75379410280d9b authored by Dr. David Alan Gilbert on 05 February 2018, 09:13:37 UTC, committed by Michael Roth on 12 February 2018, 03:05:39 UTC
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>
1 parent b9eec80
History
File Mode Size
9p-iov-marshal.c -rw-r--r-- 10.1 KB
9p-iov-marshal.h -rw-r--r-- 768 bytes
9p-marshal.c -rw-r--r-- 819 bytes
9p-marshal.h -rw-r--r-- 1.6 KB
Makefile.objs -rw-r--r-- 574 bytes
file-op-9p.h -rw-r--r-- 4.7 KB
qemu-fsdev-dummy.c -rw-r--r-- 382 bytes
qemu-fsdev-opts.c -rw-r--r-- 2.4 KB
qemu-fsdev-throttle.c -rw-r--r-- 4.4 KB
qemu-fsdev-throttle.h -rw-r--r-- 981 bytes
qemu-fsdev.c -rw-r--r-- 2.5 KB
qemu-fsdev.h -rw-r--r-- 996 bytes
virtfs-proxy-helper.c -rw-r--r-- 30.7 KB
virtfs-proxy-helper.texi -rw-r--r-- 2.1 KB

back to top