The following changes since commit f2465433b43fb87766d79f42191607dac4aed5b4:
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2020-05-19 13:42:58 +0100) are available in the Git repository at: https://repo.or.cz/qemu/ericb.git tags/pull-bitmaps-2020-05-18-v2 for you to fetch changes up to d4d42c8202261ec770bef614220742af9dfe3d81: qemu-img: Add bitmap sub-command (2020-05-19 10:41:34 -0500) v2: resolve semantic conflict with commit 43d589b0, only sending changed patch ---------------------------------------------------------------- bitmaps patches for 2020-05-18 - update bitmaps maintainers - add 'qemu-img bitmap' subcommand ---------------------------------------------------------------- Eric Blake (7): bitmaps: Update maintainer docs: Sort sections on qemu-img subcommand parameters qemu-img: Fix stale comments on doc location block: Make it easier to learn which BDS support bitmaps blockdev: Promote several bitmap functions to non-static blockdev: Split off basic bitmap operations for qemu-img qemu-img: Add bitmap sub-command docs/tools/qemu-img.rst | 72 ++++++--- Makefile.objs | 3 +- block/qcow2.h | 1 + include/block/block_int.h | 13 ++ include/block/dirty-bitmap.h | 1 + block/dirty-bitmap.c | 9 ++ block/monitor/bitmap-qmp-cmds.c | 321 ++++++++++++++++++++++++++++++++++++++++ block/qcow2-bitmap.c | 7 + block/qcow2.c | 2 + blockdev.c | 303 +------------------------------------ qemu-img.c | 251 ++++++++++++++++++++++++++++++- MAINTAINERS | 8 +- block/monitor/Makefile.objs | 1 + qemu-img-cmds.hx | 9 +- 14 files changed, 672 insertions(+), 329 deletions(-) create mode 100644 block/monitor/bitmap-qmp-cmds.c -- 2.26.2
