ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2017-04-26 15:46:48 +02:00 committed by Kevin Wolf
parent 3258b91141
commit 48758a8473
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qemu-img.c
View File

@ -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 is still -EINVAL until here */
ret = bdrv_parse_cache_mode(src_cache, &src_flags, &src_writethrough); ret = bdrv_parse_cache_mode(src_cache, &src_flags, &src_writethrough);
if (ret < 0) { if (ret < 0) {
@ -2208,6 +2202,13 @@ static int img_convert(int argc, char **argv)
} }
s.target_has_backing = (bool) out_baseimg; 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 */ /* Check if compression is supported */
if (s.compressed) { if (s.compressed) {
bool encryption = bool encryption =

4
tests/qemu-iotests/122.out
View File

@ -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) 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
read 65536/65536 bytes at offset 8388608 read 65536/65536 bytes at offset 8388608
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) 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: Having a backing file for the target 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
=== Compression with misaligned allocations and image sizes === === Compression with misaligned allocations and image sizes ===