Changes from v2->v3: Patch 2: Uh... fix that misspelling. Thanks Stefan :) Patch 3: New patch to block migration in parallels
git-backport-diff -r qemu/master.. -u 6dc6acb 001/4:[----] [--] 'block/vhdx.c: Don't blindly update the header' 002/4:[----] [--] 'block/parallels: Do not update header or truncate image when INMIGRATE' 003/4:[down] 'block/parallels: add migration blocker' 004/4:[----] [--] 'qemu-iotests: update unsupported image formats in 194' Changes from v1->v2: * Drop previous parallels patches, just check BDRV_O_INACTIVE now (Kevin) git-backport-diff -r qemu/master.. -u github/master Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/3:[----] [--] 'block/vhdx.c: Don't blindly update the header' 002/3:[down] 'block/parallals: Do not update header or truncate image when INMIGRATE' 003/3:[----] [--] 'qemu-iotests: update unsupported image formats in 194' v1: VHDX and Parallels both blindly write headers to the image file if the images are opened R/W. This causes an assert if the QEMU run state is INMIGRATE. Jeff Cody (4): block/vhdx.c: Don't blindly update the header block/parallels: Do not update header or truncate image when INMIGRATE block/parallels: add migration blocker qemu-iotests: update unsupported image formats in 194 block/parallels.c | 19 ++++++++++++++----- block/vhdx.c | 7 ------- tests/qemu-iotests/194 | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) -- 2.9.5
