On 08.05.20 20:03, Eric Blake wrote: > 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.
For the record: Yes, my comment was mostly about my confusion around the
{}. So just replacing them by () would have pacified me.
But this is more fun, of course.
> 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 <ebl...@redhat.com>
> ---
> docs/tools/qemu-img.rst | 23 ++++
> qemu-img.c | 254 ++++++++++++++++++++++++++++++++++++++++
> qemu-img-cmds.hx | 7 ++
> 3 files changed, 284 insertions(+)
>
> diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
> index 7d08c48d308f..68393c357386 100644
> --- a/docs/tools/qemu-img.rst
> +++ b/docs/tools/qemu-img.rst
> @@ -281,6 +281,29 @@ Command description:
[...]
> + Additional options ``-g`` set a non-default *GRANULARITY* for
sets?
With that fixed (or maybe not, you know that better than me):
Reviewed-by: Max Reitz <mre...@redhat.com>
signature.asc
Description: OpenPGP digital signature
