[Qemu-commits] [qemu/qemu] edb059: bitmaps: Update maintainer

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: edb059040371784d12c05c0f3a19a9ddcd3a868d
      
https://github.com/qemu/qemu/commit/edb059040371784d12c05c0f3a19a9ddcd3a868d
  Author: Eric Blake <address@hidden>
  Date:   2020-05-19 (Tue, 19 May 2020)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  bitmaps: Update maintainer

Dirty bitmaps are important to incremental backups, including exposure
over NBD where I'm already maintainer.  Also, I'm aware that lately I
have been doing as much code/review on bitmaps as John Snow who is
trying to scale back in order to focus elsewhere; and many of the
recent patches have come from Vladimir, who is also interested in
taking on maintainer duties, but would like to start with
co-maintainership.  Therefore, it's time to revamp the ownership of
this category, as agreed between the three of us.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Acked-by: John Snow <address@hidden>
Reviewed-by: John Snow <address@hidden>


  Commit: 6edb788f292a83ad5f77b25bf90ed0eb14800639
      
https://github.com/qemu/qemu/commit/6edb788f292a83ad5f77b25bf90ed0eb14800639
  Author: Eric Blake <address@hidden>
  Date:   2020-05-19 (Tue, 19 May 2020)

  Changed paths:
    M docs/tools/qemu-img.rst

  Log Message:
  -----------
  docs: Sort sections on qemu-img subcommand parameters

We already list the subcommand summaries alphabetically, we should do
the same for the documentation related to subcommand-specific
parameters.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>


  Commit: 0562adf51712c3c0354d68e745afb7e6705668f1
      
https://github.com/qemu/qemu/commit/0562adf51712c3c0354d68e745afb7e6705668f1
  Author: Eric Blake <address@hidden>
  Date:   2020-05-19 (Tue, 19 May 2020)

  Changed paths:
    M qemu-img-cmds.hx
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Fix stale comments on doc location

Missed in commit e13c59fa.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>


  Commit: ef893b5c84f3199d777e33966dc28839f71b1a5c
      
https://github.com/qemu/qemu/commit/ef893b5c84f3199d777e33966dc28839f71b1a5c
  Author: Eric Blake <address@hidden>
  Date:   2020-05-19 (Tue, 19 May 2020)

  Changed paths:
    M block/dirty-bitmap.c
    M block/qcow2-bitmap.c
    M block/qcow2.c
    M block/qcow2.h
    M include/block/block_int.h
    M include/block/dirty-bitmap.h

  Log Message:
  -----------
  block: Make it easier to learn which BDS support bitmaps

Upcoming patches will enhance bitmap support in qemu-img, but in doing
so, it turns out to be nice to suppress output when persistent bitmaps
make no sense (such as on a qcow2 v2 image).  Add a hook to make this
easier to query.

This patch adds a new callback .bdrv_supports_persistent_dirty_bitmap,
rather than trying to shoehorn the answer in via existing callbacks.
In particular, while it might have been possible to overload
.bdrv_co_can_store_new_dirty_bitmap to special-case a NULL input to
answer whether any persistent bitmaps are supported, that is at odds
with whether a particular bitmap can be stored (for example, even on
an image that supports persistent bitmaps but has currently filled up
the maximum number of bitmaps, attempts to store another one should
fail); and the new functionality doesn't require coroutine safety.
Similarly, we could have added one more piece of information to
.bdrv_get_info, but then again, most callers to that function tend to
already discard extraneous information, and making it a catch-all
rather than a series of dedicated scalar queries hasn't really
simplified life.

In the future, when we improve the ability to look up bitmaps through
a filter, we will probably also want to teach the block layer to
automatically let filters pass this request on through.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>


  Commit: c6996cf9a6c759c29919642be9a73ac64b38301b
      
https://github.com/qemu/qemu/commit/c6996cf9a6c759c29919642be9a73ac64b38301b
  Author: Eric Blake <address@hidden>
  Date:   2020-05-19 (Tue, 19 May 2020)

  Changed paths:
    M blockdev.c
    M include/block/block_int.h

  Log Message:
  -----------
  blockdev: Promote several bitmap functions to non-static

The next patch will split blockdev.c, which will require accessing
some previously-static functions from more than one .c file.  But part
of promoting a function to public is picking a naming scheme that does
not reek of exposing too many internals (two of the three functions
were named starting with 'do_').  To make future code motion easier,
perform the function rename and non-static promotion into its own
patch.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>


  Commit: bb4e58c6137e80129b955789dd4b66c1504f20dc
      
https://github.com/qemu/qemu/commit/bb4e58c6137e80129b955789dd4b66c1504f20dc
  Author: Eric Blake <address@hidden>
  Date:   2020-05-19 (Tue, 19 May 2020)

  Changed paths:
    M MAINTAINERS
    M Makefile.objs
    M block/monitor/Makefile.objs
    A block/monitor/bitmap-qmp-cmds.c
    M blockdev.c

  Log Message:
  -----------
  blockdev: Split off basic bitmap operations for qemu-img

Upcoming patches want to add some basic bitmap manipulation abilities
to qemu-img.  But blockdev.o is too heavyweight to link into qemu-img
(among other things, it would drag in block jobs and transaction
support - qemu-img does offline manipulation, where atomicity is less
important because there are no concurrent modifications to compete
with), so it's time to split off the bare bones of what we will need
into a new file block/monitor/bitmap-qmp-cmds.o.

This is sufficient to expose 6 QMP commands for use by qemu-img (add,
remove, clear, enable, disable, merge), as well as move the three
helper functions touched in the previous patch.  Regarding
MAINTAINERS, the new file is automatically part of block core, but
also makes sense as related to other dirty bitmap files.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>


  Commit: 3b51ab4bf0f49a01cc2db7b954e0669e081719b5
      
https://github.com/qemu/qemu/commit/3b51ab4bf0f49a01cc2db7b954e0669e081719b5
  Author: Eric Blake <address@hidden>
  Date:   2020-05-19 (Tue, 19 May 2020)

  Changed paths:
    M docs/tools/qemu-img.rst
    M qemu-img-cmds.hx
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Add bitmap sub-command

Include actions for --add, --remove, --clear, --enable, --disable, and
--merge (note that --clear is a bit of fluff, because the same can be
accomplished by removing a bitmap and then adding a new one in its
place, but it matches what QMP commands exist).  Listing is omitted,
because it does not require a bitmap name and because it was already
possible with 'qemu-img info'.  A single command line can play one or
more bitmap commands in sequence on the same bitmap name (although all
added bitmaps share the same granularity, and and all merged bitmaps
come from the same source file).  Merge defaults to other bitmaps in
the primary image, but can also be told to merge bitmaps from a
distinct image.

While this supports --image-opts for the file being modified, I did
not think it worth the extra complexity to support that for the source
file in a cross-file merges.  Likewise, I chose to have --merge only
take a single source rather than following the QMP support for
multiple merges in one go (although you can still use more than one
--merge in the command line); in part because qemu-img is offline and
therefore atomicity is not an issue.

Upcoming patches will add iotest coverage of these commands while
also testing other features.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>


  Commit: 8b9112e4aef0651feff82e49d1e58947cceab66a
      
https://github.com/qemu/qemu/commit/8b9112e4aef0651feff82e49d1e58947cceab66a
  Author: Peter Maydell <address@hidden>
  Date:   2020-05-21 (Thu, 21 May 2020)

  Changed paths:
    M MAINTAINERS
    M Makefile.objs
    M block/dirty-bitmap.c
    M block/monitor/Makefile.objs
    A block/monitor/bitmap-qmp-cmds.c
    M block/qcow2-bitmap.c
    M block/qcow2.c
    M block/qcow2.h
    M blockdev.c
    M docs/tools/qemu-img.rst
    M include/block/block_int.h
    M include/block/dirty-bitmap.h
    M qemu-img-cmds.hx
    M qemu-img.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-05-18-v3' 
into staging

bitmaps patches for 2020-05-18

- update bitmaps maintainers
- add 'qemu-img bitmap' subcommand

# gpg: Signature made Tue 19 May 2020 18:53:59 BST
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <address@hidden>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<address@hidden>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-bitmaps-2020-05-18-v3:
  qemu-img: Add bitmap sub-command
  blockdev: Split off basic bitmap operations for qemu-img
  blockdev: Promote several bitmap functions to non-static
  block: Make it easier to learn which BDS support bitmaps
  qemu-img: Fix stale comments on doc location
  docs: Sort sections on qemu-img subcommand parameters
  bitmaps: Update maintainer

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/956ae3e9265f...8b9112e4aef0