From ffd8e8ffd5410ecea17c62785bf445b7ecddd8d6 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 9 Aug 2019 11:09:21 +0200 Subject: [PATCH] qemu-img convert: Deprecate using -n and -o together bdrv_create options specified with -o have no effect when skipping image creation with -n, so this doesn't make sense. Warn against the misuse and deprecate the combination so we can make it a hard error later. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Reviewed-by: John Snow Reviewed-by: Eric Blake --- qemu-deprecated.texi | 7 +++++++ qemu-img.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index fff07bb2a319..f7680c08e10a 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -305,6 +305,13 @@ to just export the entire image and then mount only /dev/nbd0p1 than it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a subset of the image. +@subsection qemu-img convert -n -o (since 4.2.0) + +All options specified in @option{-o} are image creation options, so +they have no effect when used with @option{-n} to skip image creation. +Silently ignored options can be confusing, so this combination of +options will be made an error in future versions. + @section Build system @subsection Python 2 support (since 4.1.0) diff --git a/qemu-img.c b/qemu-img.c index 79983772de39..d9321f6418bb 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2231,6 +2231,11 @@ static int img_convert(int argc, char **argv) goto fail_getopt; } + if (skip_create && options) { + warn_report("-o has no effect when skipping image creation"); + warn_report("This will become an error in future QEMU versions."); + } + s.src_num = argc - optind - 1; out_filename = s.src_num >= 1 ? argv[argc - 1] : NULL;