The following changes since commit a28c9c8c9fc42484efe1bf5a77affe842e54e38b:

  Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200518-pull-request' into staging (2020-05-18 16:37:09 +0100)

are available in the Git repository at:

  https://repo.or.cz/qemu/ericb.git tags/pull-bitmaps-2020-05-18

for you to fetch changes up to 6660c3a69c668ff98e2a86bca0b1301648ff4b02:

  qemu-img: Add bitmap sub-command (2020-05-18 15:32:56 -0500)

----------------------------------------------------------------
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

On Mon, 18 May 2020 at 21:55, Eric Blake <eblake@redhat.com> wrote:
>
> The following changes since commit a28c9c8c9fc42484efe1bf5a77affe842e54e38b:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200518-pull-request' into staging (2020-05-18 16:37:09 +0100)
>
> are available in the Git repository at:
>
>   https://repo.or.cz/qemu/ericb.git tags/pull-bitmaps-2020-05-18
>
> for you to fetch changes up to 6660c3a69c668ff98e2a86bca0b1301648ff4b02:
>
>   qemu-img: Add bitmap sub-command (2020-05-18 15:32:56 -0500)
>
> ----------------------------------------------------------------
> bitmaps patches for 2020-05-18
>
> - update bitmaps maintainers
> - add 'qemu-img bitmap' subcommand

Hi; this fails to compile:

/home/petmay01/linaro/qemu-for-merges/qemu-img.c: In function ‘img_bitmap’:
/home/petmay01/linaro/qemu-for-merges/qemu-img.c:4593:27: error: too
few arguments to function ‘cvtnum’
             granularity = cvtnum(optarg);
                           ^~~~~~
/home/petmay01/linaro/qemu-for-merges/qemu-img.c:510:16: note: declared here
 static int64_t cvtnum(const char *name, const char *value)
                ^~~~~~


thanks
-- PMM

On 5/19/20 7:42 AM, Peter Maydell wrote:
> On Mon, 18 May 2020 at 21:55, Eric Blake <eblake@redhat.com> wrote:
>>
>> The following changes since commit a28c9c8c9fc42484efe1bf5a77affe842e54e38b:
>>
>>    Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200518-pull-request' into staging (2020-05-18 16:37:09 +0100)
>>
>> are available in the Git repository at:
>>
>>    https://repo.or.cz/qemu/ericb.git tags/pull-bitmaps-2020-05-18
>>
>> for you to fetch changes up to 6660c3a69c668ff98e2a86bca0b1301648ff4b02:
>>
>>    qemu-img: Add bitmap sub-command (2020-05-18 15:32:56 -0500)
>>
>> ----------------------------------------------------------------
>> bitmaps patches for 2020-05-18
>>
>> - update bitmaps maintainers
>> - add 'qemu-img bitmap' subcommand
> 
> Hi; this fails to compile:
> 
> /home/petmay01/linaro/qemu-for-merges/qemu-img.c: In function ‘img_bitmap’:
> /home/petmay01/linaro/qemu-for-merges/qemu-img.c:4593:27: error: too
> few arguments to function ‘cvtnum’
>               granularity = cvtnum(optarg);
>                             ^~~~~~

Semantic conflict with my NBD queue that got merged first. Will post v2 
pull request shortly.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org