Commit 48758a84 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

qemu-img/convert: Move bs_n > 1 && -B check down 



It does not make much sense to use a backing image for the target when
you concatenate multiple images (because then there is no correspondence
between the source images' backing files and the target's); but it was
still possible to give one by using -o backing_file=X instead of -B X.

Fix this by moving the check.

(Also, change the error message because -B is not the only way to
 specify the backing file, evidently.)

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 3258b911

qemu-img.c

+7 −6
Original line number Diff line number Diff line
@@ -2089,12 +2089,6 @@ static int img_convert(int argc, char **argv) 
    }





    if (s.src_num > 1 && out_baseimg) {

        error_report("-B makes no sense when concatenating multiple input "

                     "images");

        goto fail_getopt;

    }



    /* ret is still -EINVAL until here */

    ret = bdrv_parse_cache_mode(src_cache, &src_flags, &src_writethrough);

    if (ret < 0) {
@@ -2208,6 +2202,13 @@ static int img_convert(int argc, char **argv) 
    }

    s.target_has_backing = (bool) out_baseimg;



    if (s.src_num > 1 && out_baseimg) {

        error_report("Having a backing file for the target makes no sense when "

                     "concatenating multiple input images");

        ret = -1;

        goto out;

    }



    /* Check if compression is supported */

    if (s.compressed) {

        bool encryption =

tests/qemu-iotests/122.out

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ read 65536/65536 bytes at offset 4194304 
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

read 65536/65536 bytes at offset 8388608

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

qemu-img: -B makes no sense when concatenating multiple input images

qemu-img: -B makes no sense when concatenating multiple input images

qemu-img: Having a backing file for the target makes no sense when concatenating multiple input images

qemu-img: Having a backing file for the target makes no sense when concatenating multiple input images



=== Compression with misaligned allocations and image sizes ===