diff options
| author | Eric Blake | 2020-07-06 22:39:46 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2020-07-14 15:18:59 +0200 |
| commit | 25956af3fe5dd0385ad8017bc768a6afe41e2a74 (patch) | |
| tree | 3a8457c7cfddb8bc20179df2f7faeaf460ca8491 /qemu-img.c | |
| parent | qemu-img: Flush stdout before before potential stderr messages (diff) | |
| download | qemu-25956af3fe5dd0385ad8017bc768a6afe41e2a74.tar.gz qemu-25956af3fe5dd0385ad8017bc768a6afe41e2a74.tar.xz qemu-25956af3fe5dd0385ad8017bc768a6afe41e2a74.zip | |
block: Finish deprecation of 'qemu-img convert -n -o'
It's been two releases since we started warning; time to make the
combination an error as promised. There was no iotest coverage, so
add some.
While touching the documentation, tweak another section heading for
consistent style.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200706203954.341758-3-eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-img.c b/qemu-img.c index 4548dbff82..46d2796fb2 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2364,8 +2364,8 @@ static int img_convert(int argc, char **argv) } 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."); + error_report("-o has no effect when skipping image creation"); + goto fail_getopt; } if (s.has_zero_init && !skip_create) { |