[PATCH v5 0/5] qemu-img: Add convert --bitmaps

Eric Blake posted 5 patches 1 week ago
Failed in applying to current master (apply log)
docs/tools/qemu-img.rst          |  18 ++++-
qapi/block-core.json             |  15 ++--
block/qcow2.h                    |   2 +
block/crypto.c                   |   2 +-
block/qcow2-bitmap.c             |  36 +++++++++
block/qcow2.c                    |  14 +++-
block/raw-format.c               |   2 +-
qemu-img.c                       | 135 +++++++++++++++++++++++++++----
qemu-img-cmds.hx                 |   8 +-
tests/qemu-iotests/178.out.qcow2 |  18 ++++-
tests/qemu-iotests/178.out.raw   |   2 +-
tests/qemu-iotests/190           |  58 ++++++++++++-
tests/qemu-iotests/190.out       |  35 +++++++-
tests/qemu-iotests/291           | 112 +++++++++++++++++++++++++
tests/qemu-iotests/291.out       |  80 ++++++++++++++++++
tests/qemu-iotests/group         |   1 +
16 files changed, 501 insertions(+), 37 deletions(-)
create mode 100755 tests/qemu-iotests/291
create mode 100644 tests/qemu-iotests/291.out

[PATCH v5 0/5] qemu-img: Add convert --bitmaps

Posted by Eric Blake 1 week ago
v4 was here:
https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg03182.html
original cover letter here:
https://lists.gnu.org/archive/html/qemu-devel/2020-04/msg03464.html

Based-on: <20200519175707.815782-1-eblake@redhat.com>
[pull v3 bitmaps patches for 2020-05-18]

Since then:
- patch 1 is new (fixes regression from recent NBD pull)
- patch 2, 4: include fixes suggested by Vladimir; biggest is that
bitmaps computation is now in qcow2-bitmaps.c instead of qcow2.c
- patch 3: split out from patch 4 (was v4 8/9)
- patch 5: rebase to master

001/5:[down] 'iotests: Fix test 178'
002/5:[0106] [FC] 'qcow2: Expose bitmaps' size during measure'
003/5:[down] 'qemu-img: Factor out code for merging bitmaps'
004/5:[0012] [FC] 'qemu-img: Add convert --bitmaps option'
005/5:[0002] [FC] 'iotests: Add test 291 to for qemu-img bitmap coverage'

Series can also be downloaded at:
https://repo.or.cz/qemu/ericb.git/shortlog/refs/tags/qemu-img-bitmaps-v5

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

 docs/tools/qemu-img.rst          |  18 ++++-
 qapi/block-core.json             |  15 ++--
 block/qcow2.h                    |   2 +
 block/crypto.c                   |   2 +-
 block/qcow2-bitmap.c             |  36 +++++++++
 block/qcow2.c                    |  14 +++-
 block/raw-format.c               |   2 +-
 qemu-img.c                       | 135 +++++++++++++++++++++++++++----
 qemu-img-cmds.hx                 |   8 +-
 tests/qemu-iotests/178.out.qcow2 |  18 ++++-
 tests/qemu-iotests/178.out.raw   |   2 +-
 tests/qemu-iotests/190           |  58 ++++++++++++-
 tests/qemu-iotests/190.out       |  35 +++++++-
 tests/qemu-iotests/291           | 112 +++++++++++++++++++++++++
 tests/qemu-iotests/291.out       |  80 ++++++++++++++++++
 tests/qemu-iotests/group         |   1 +
 16 files changed, 501 insertions(+), 37 deletions(-)
 create mode 100755 tests/qemu-iotests/291
 create mode 100644 tests/qemu-iotests/291.out

-- 
2.26.2