The following changes since commit a20ab81d22300cca80325c284f21eefee99aa740:
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-05-28' into staging (2020-05-28 16:18:06 +0100) are available in the Git repository at: https://repo.or.cz/qemu/ericb.git tags/pull-bitmaps-2020-05-26-v3 for you to fetch changes up to cf2d1203dcfc2bf964453d83a2302231ce77f2dc: iotests: Add test 291 to for qemu-img bitmap coverage (2020-05-28 13:16:30 -0500) v3: port sed expression to BSD sed v2: fix iotest 190 to not be as sensitive to different sparseness of qcow2 file on various filesystems, such as FreeBSD (sending only the changed patch) ---------------------------------------------------------------- bitmaps patches for 2020-05-26 - fix non-blockdev migration of bitmaps when mirror job is in use - add bitmap sizing to 'qemu-img measure' - add 'qemu-img convert --bitmaps' ---------------------------------------------------------------- Eric Blake (5): iotests: Fix test 178 qcow2: Expose bitmaps' size during measure qemu-img: Factor out code for merging bitmaps qemu-img: Add convert --bitmaps option iotests: Add test 291 to for qemu-img bitmap coverage Vladimir Sementsov-Ogievskiy (6): migration: refactor init_dirty_bitmap_migration block/dirty-bitmap: add bdrv_has_named_bitmaps helper migration: fix bitmaps pre-blockdev migration with mirror job iotests: 194: test also migration of dirty bitmap migration: add_bitmaps_to_list: check disk name once migration: forbid bitmap migration by generated node-name docs/tools/qemu-img.rst | 13 +++- qapi/block-core.json | 16 +++-- block/qcow2.h | 2 + include/block/dirty-bitmap.h | 1 + block/crypto.c | 2 +- block/dirty-bitmap.c | 13 ++++ block/qcow2-bitmap.c | 36 ++++++++++ block/qcow2.c | 14 +++- block/raw-format.c | 2 +- migration/block-dirty-bitmap.c | 142 ++++++++++++++++++++++++++++----------- qemu-img.c | 107 ++++++++++++++++++++++++----- qemu-img-cmds.hx | 4 +- tests/qemu-iotests/178.out.qcow2 | 18 ++++- tests/qemu-iotests/178.out.raw | 2 +- tests/qemu-iotests/190 | 47 ++++++++++++- tests/qemu-iotests/190.out | 27 +++++++- tests/qemu-iotests/194 | 14 ++-- tests/qemu-iotests/194.out | 6 ++ tests/qemu-iotests/291 | 112 ++++++++++++++++++++++++++++++ tests/qemu-iotests/291.out | 80 ++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 21 files changed, 582 insertions(+), 77 deletions(-) create mode 100755 tests/qemu-iotests/291 create mode 100644 tests/qemu-iotests/291.out -- 2.26.2