From: Lidong Chen <lidongc...@tencent.com> 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 <lidongc...@tencent.com> --- 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