summaryrefslogtreecommitdiffstats
path: root/qemu-img.c
diff options
context:
space:
mode:
authorMax Reitz2017-04-26 15:46:48 +0200
committerKevin Wolf2017-04-27 17:26:28 +0200
commit48758a84738c5be8cf022062ed0b85ff2ebacc0c (patch)
treef1207a4088f71c1458ef491d5b2df8976d215a47 /qemu-img.c
parentqemu-img/convert: Use @opts for one thing only (diff)
downloadqemu-48758a84738c5be8cf022062ed0b85ff2ebacc0c.tar.gz
qemu-48758a84738c5be8cf022062ed0b85ff2ebacc0c.tar.xz
qemu-48758a84738c5be8cf022062ed0b85ff2ebacc0c.zip
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>
Diffstat (limited to 'qemu-img.c')
-rw-r--r--qemu-img.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/qemu-img.c b/qemu-img.c
index e0503aec9b..704488484d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -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 =