Re: [Qemu-block] [PATCH v2] qemu-img: check bs_n when use old style option

[858585 jemmy]

test result for this patch:
qemu-img convert -c -p -o
backing_file=/baseimage/img2015122818606660/img2015122818606660.qcow2
-O qcow2 /data/img2017041611162809.qcow2
/data/img2017041611162809.qcow2 /mnt/img2017041611162809_zip_new.qcow2
qemu-img: Specifying backing image makes no sense when concatenating
multiple input images

qemu-img convert -c -p -B
baseimage/img2015122818606660/img2015122818606660.qcow2 -O qcow2
/data/img2017041611162809.qcow2 /data/img2017041611162809.qcow2
/mnt/img2017041611162809_zip_new.qcow2
qemu-img: Specifying backing image makes no sense when concatenating
multiple input images


On Thu, Apr 20, 2017 at 5:19 PM,  <address@hidden> wrote:
> From: Lidong Chen <address@hidden>
>
> When use old style option like -o backing_file, img_convert
> continue run when bs_n > 1, this patch fix this bug.
>
> Signed-off-by: Lidong Chen <address@hidden>
> ---
> v2 changelog:
>     avoid duplicating code.
> ---
>  qemu-img.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/qemu-img.c b/qemu-img.c
> index b220cf7..b4d9255 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -2108,14 +2108,6 @@ static int img_convert(int argc, char **argv)
>          error_exit("Must specify image file name");
>      }
>
> -
> -    if (bs_n > 1 && out_baseimg) {
> -        error_report("-B makes no sense when concatenating multiple input "
> -                     "images");
> -        ret = -1;
> -        goto out;
> -    }
> -
>      src_flags = 0;
>      ret = bdrv_parse_cache_mode(src_cache, &src_flags, &src_writethrough);
>      if (ret < 0) {
> @@ -2225,6 +2217,13 @@ static int img_convert(int argc, char **argv)
>          out_baseimg = out_baseimg_param;
>      }
>
> +    if (bs_n > 1 && out_baseimg) {
> +        error_report("Specifying backing image makes no sense when "
> +                     "concatenating multiple input images");
> +        ret = -1;
> +        goto out;
> +    }
> +
>      /* Check if compression is supported */
>      if (compress) {
>          bool encryption =
> --
> 1.8.3.1
>