summaryrefslogtreecommitdiff
path: root/qemu-img.c
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2021-05-03 14:36:00 -0700
committerKevin Wolf <kwolf@redhat.com>2021-07-09 13:18:32 +0200
commit497a30dbb065937d67f6c43af6dd78492e1d6f6d (patch)
tree2a6244c2bd5ddf0f69f8427724713eeac1c1baba /qemu-img.c
parent5a385bf5c5cb3069fab17c014cf4b4f629509f1e (diff)
downloadqemu-497a30dbb065937d67f6c43af6dd78492e1d6f6d.zip
qemu-img: Require -F with -b backing image
Back in commit d9f059aa6c (qemu-img: Deprecate use of -b without -F), we deprecated the ability to create a file with a backing image that requires qemu to perform format probing. Qemu can still probe older files for backwards compatibility, but it is time to finish off the ability to create such images, due to the potential security risk they present. Update a couple of iotests affected by the change. Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <20210503213600.569128-3-eblake@redhat.com> Reviewed-by: Connor Kuehl <ckuehl@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-img.c')
-rw-r--r--qemu-img.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/qemu-img.c b/qemu-img.c
index 7956a89965..ec0e2fabe5 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2508,8 +2508,10 @@ static int img_convert(int argc, char **argv)
if (out_baseimg_param) {
if (!qemu_opt_get(opts, BLOCK_OPT_BACKING_FMT)) {
- warn_report("Deprecated use of backing file without explicit "
- "backing format");
+ error_report("Use of backing file requires explicit "
+ "backing format");
+ ret = -1;
+ goto out;
}
}