From 283d845c9164f57f5dba020a4783bb290493802f Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrangé" Date: Fri, 19 Feb 2021 17:56:13 +0000 Subject: monitor: raise error when 'pretty' option is used with HMP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is only semantically useful for QMP. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrangé --- docs/system/deprecated.rst | 7 ------- docs/system/removed-features.rst | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'docs/system') diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 0e1fdf5c14..8f4d756e35 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -53,13 +53,6 @@ needs two devices (``-device intel-hda -device hda-duplex``) and ``pcspk`` which can be activated using ``-machine pcspk-audiodev=``. -``-mon ...,control=readline,pretty=on|off`` (since 4.1) -''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -The ``pretty=on|off`` switch has no effect for HMP monitors, but is -silently ignored. Using the switch with HMP monitors will become an -error in the future. - RISC-V ``-bios`` (since 5.1) '''''''''''''''''''''''''''' diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst index aa612c2846..372aadceae 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -51,6 +51,12 @@ host controller or ``-usb`` if necessary). The ``acl`` option to the ``-vnc`` argument has been replaced by the ``tls-authz`` and ``sasl-authz`` options. +``-mon ...,control=readline,pretty=on|off`` (removed in 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +The ``pretty=on|off`` switch has no effect for HMP monitors and +its use is rejected. + QEMU Machine Protocol (QMP) commands ------------------------------------ -- cgit 1.4.1