]> git.proxmox.com Git - mirror_qemu.git/commit
qemu-img/convert: Move bs_n > 1 && -B check down
authorMax Reitz <mreitz@redhat.com>
Thu, 13 Apr 2017 20:34:01 +0000 (22:34 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Mon, 31 Jul 2017 21:22:00 +0000 (16:22 -0500)
commitbc70597a487a3bb8585c155a43d09dcff5e4ffd2
treeaa47d19732ba59cc8d60cbd6575983d9a7c5d41b
parenta1c850fd9d491594b39b23dace01b1fb3ca83236
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.)

Cc: qemu-stable <qemu-stable@nongnu.org>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
* applied patch from v1 of series as suggested by author
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
qemu-img.c
tests/qemu-iotests/122.out