Re: [PATCH v2 5/6] qemu-img: Add convert --bitmaps option

[Max Reitz]

On 21.04.20 23:20, Eric Blake wrote:
> Make it easier to copy all the persistent bitmaps of a source image
> along with the contents, by adding a boolean flag for use with
> qemu-img convert.  This is basically shorthand, as the same effect
> could be accomplished with a series of 'qemu-img bitmap --add' and
> 'qemu-img bitmap --merge -b source' commands, or by QMP commands.
> 
> See also https://bugzilla.redhat.com/show_bug.cgi?id=1779893
> 
> Signed-off-by: Eric Blake <address@hidden>
> ---
>  docs/tools/qemu-img.rst |  6 +++-
>  qemu-img.c              | 80 +++++++++++++++++++++++++++++++++++++++--
>  qemu-img-cmds.hx        |  4 +--
>  3 files changed, 84 insertions(+), 6 deletions(-)

[...]

> diff --git a/qemu-img.c b/qemu-img.c
> index e1127273f21e..6cfc1f52ef98 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c

[...]

> @@ -2293,7 +2342,6 @@ static int img_convert(int argc, char **argv)
>          goto fail_getopt;
>      }
> 
> -
>      /* ret is still -EINVAL until here */
>      ret = bdrv_parse_cache_mode(src_cache, &src_flags, &src_writethrough);
>      if (ret < 0) {

[...]

> @@ -2461,9 +2531,7 @@ static int img_convert(int argc, char **argv)
>      if (!skip_create) {
>          open_opts = qdict_new();
>          qemu_opt_foreach(opts, img_add_key_secrets, open_opts, &error_abort);
> -    }
> 
> -    if (!skip_create) {

I mean, cleanups are always welcome, but I feel compelled[1] to complain
that it’s done in this patch without mentioning it in the commit message.

[1] By social norms, not by my personal opinion.

I feel good about all changes, though, so:

Reviewed-by: Max Reitz <address@hidden>

signature.asc
Description: OpenPGP digital signature