motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qemu-img convert: Deprecate using -n and -o together

Browse source 
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 <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2019-08-09 11:09:21 +02:00
parent cf3129323f
commit ffd8e8ffd5
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qemu-deprecated.texi
View file

@ -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 it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a
subset of the image. 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 @section Build system
@subsection Python 2 support (since 4.1.0) @subsection Python 2 support (since 4.1.0)

5
qemu-img.c
View file

@ -2231,6 +2231,11 @@ static int img_convert(int argc, char **argv)
goto fail_getopt; 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; s.src_num = argc - optind - 1;
out_filename = s.src_num >= 1 ? argv[argc - 1] : NULL; out_filename = s.src_num >= 1 ? argv[argc - 1] : NULL;