[PULL 0/3] block bitmaps patches for rc1, 2021-07-21

[Eric Blake]

The following changes since commit e77c8b8b8e933414ef07dbed04e02973fccffeb0:

  Update version for v6.1.0-rc0 release (2021-07-21 17:10:15 +0100)

are available in the Git repository at:

  https://repo.or.cz/qemu/ericb.git tags/pull-bitmaps-2021-07-21

for you to fetch changes up to 955171e4417bf39edb5503e694501e082a757731:

  qemu-img: Add --skip-broken-bitmaps for 'convert --bitmaps' (2021-07-21 
14:14:41 -0500)

----------------------------------------------------------------
block bitmaps patches for 2021-07-21

- fix 'qemu-img convert --bitmaps' handling of qcow2 files with
  inconsistent bitmaps

----------------------------------------------------------------
Eric Blake (3):
      iotests: Improve and rename test 291 to qemu-img-bitmap
      qemu-img: Fail fast on convert --bitmaps with inconsistent bitmap
      qemu-img: Add --skip-broken-bitmaps for 'convert --bitmaps'

 docs/tools/qemu-img.rst                            |  8 ++-
 block/dirty-bitmap.c                               |  2 +-
 qemu-img.c                                         | 50 ++++++++++++++--
 tests/qemu-iotests/{291 => tests/qemu-img-bitmaps} | 34 ++++++++++-
 .../{291.out => tests/qemu-img-bitmaps.out}        | 67 +++++++++++++++++++++-
 5 files changed, 152 insertions(+), 9 deletions(-)
 rename tests/qemu-iotests/{291 => tests/qemu-img-bitmaps} (79%)
 rename tests/qemu-iotests/{291.out => tests/qemu-img-bitmaps.out} (70%)

-- 
2.31.1