aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2020-07-06 15:39:46 -0500
committerKevin Wolf <kwolf@redhat.com>2020-07-14 15:18:59 +0200
commit25956af3fe5dd0385ad8017bc768a6afe41e2a74 (patch)
tree3a8457c7cfddb8bc20179df2f7faeaf460ca8491 /docs
parent4e2f4418784da09cb106264340241856cd2846df (diff)
downloadqemu-25956af3fe5dd0385ad8017bc768a6afe41e2a74.zip
qemu-25956af3fe5dd0385ad8017bc768a6afe41e2a74.tar.gz
qemu-25956af3fe5dd0385ad8017bc768a6afe41e2a74.tar.bz2
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 'docs')
-rw-r--r--docs/system/deprecated.rst18
1 files changed, 8 insertions, 10 deletions
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index 58a9aeb..aa9fdc8 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -427,14 +427,6 @@ kernel in 2018, and has also been dropped from glibc.
Related binaries
----------------
-``qemu-img convert -n -o`` (since 4.2.0)
-''''''''''''''''''''''''''''''''''''''''
-
-All options specified in ``-o`` are image creation options, so
-they have no effect when used with ``-n`` to skip image creation.
-Silently ignored options can be confusing, so this combination of
-options will be made an error in future versions.
-
Backwards compatibility
-----------------------
@@ -540,8 +532,8 @@ spec you can use the ``-cpu rv64gcsu,priv_spec=v1.10.0`` command line argument.
Related binaries
----------------
-``qemu-nbd --partition`` (removed in 5.0.0)
-'''''''''''''''''''''''''''''''''''''''''''
+``qemu-nbd --partition`` (removed in 5.0)
+'''''''''''''''''''''''''''''''''''''''''
The ``qemu-nbd --partition $digit`` code (also spelled ``-P``)
could only handle MBR partitions, and never correctly handled logical
@@ -557,6 +549,12 @@ can be rewritten as::
qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.file.driver=file,file.file.filename=file.qcow2
+``qemu-img convert -n -o`` (removed in 5.1)
+'''''''''''''''''''''''''''''''''''''''''''
+
+All options specified in ``-o`` are image creation options, so
+they are now rejected when used with ``-n`` to skip image creation.
+
Command line options
--------------------