[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/13] monitor: raise error when 'pretty' option is used with HMP
From: |
Daniel P . Berrangé |
Subject: |
[PULL 02/13] monitor: raise error when 'pretty' option is used with HMP |
Date: |
Tue, 16 Mar 2021 16:43:44 +0000 |
This is only semantically useful for QMP.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
docs/system/deprecated.rst | 7 -------
docs/system/removed-features.rst | 6 ++++++
monitor/monitor.c | 4 ++--
qemu-options.hx | 5 +++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index 32bda5f4ef..269fe2bcac 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -62,13 +62,6 @@ needs two devices (``-device intel-hda -device hda-duplex``)
and
``pcspk`` which can be activated using ``-machine
pcspk-audiodev=<name>``.
-``-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 93384746a1..5fbec3b963 100644
--- a/docs/system/removed-features.rst
+++ b/docs/system/removed-features.rst
@@ -44,6 +44,12 @@ block cache, ``-accel tcg,tb-size=``.
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
------------------------------------
diff --git a/monitor/monitor.c b/monitor/monitor.c
index e94f532cf5..515efb015e 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -720,8 +720,8 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp,
Error **errp)
return -1;
}
if (opts->pretty) {
- warn_report("'pretty' is deprecated for HMP monitors, it has no "
- "effect and will be removed in future versions");
+ error_setg(errp, "'pretty' is not compatible with HMP monitors");
+ return -1;
}
monitor_init_hmp(chr, true, &local_err);
break;
diff --git a/qemu-options.hx b/qemu-options.hx
index 622d3bfa5a..17dc791d5d 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3703,8 +3703,9 @@ DEF("mon", HAS_ARG, QEMU_OPTION_mon, \
"-mon [chardev=]name[,mode=readline|control][,pretty[=on|off]]\n",
QEMU_ARCH_ALL)
SRST
``-mon [chardev=]name[,mode=readline|control][,pretty[=on|off]]``
- Setup monitor on chardev name. ``pretty`` turns on JSON pretty
- printing easing human reading and debugging.
+ Setup monitor on chardev name. ``pretty`` is only valid when
+ ``mode=control``, turning on JSON pretty printing to ease
+ human reading and debugging.
ERST
DEF("debugcon", HAS_ARG, QEMU_OPTION_debugcon, \
--
2.30.2
- [PULL 00/13] misc patches removing deprecated features, Daniel P . Berrangé, 2021/03/16
- [PULL 01/13] ui, monitor: remove deprecated VNC ACL option and HMP commands, Daniel P . Berrangé, 2021/03/16
- [PULL 02/13] monitor: raise error when 'pretty' option is used with HMP,
Daniel P . Berrangé <=
- [PULL 03/13] monitor: remove 'query-events' QMP command, Daniel P . Berrangé, 2021/03/16
- [PULL 04/13] migrate: remove QMP/HMP commands for speed, downtime and cache size, Daniel P . Berrangé, 2021/03/16
- [PULL 05/13] machine: remove 'query-cpus' QMP command, Daniel P . Berrangé, 2021/03/16
- [PULL 06/13] machine: remove 'arch' field from 'query-cpus-fast' QMP command, Daniel P . Berrangé, 2021/03/16
- [PULL 07/13] chardev: reject use of 'wait' flag for socket client chardevs, Daniel P . Berrangé, 2021/03/16
- [PULL 08/13] hw/ide: remove 'ide-drive' device, Daniel P . Berrangé, 2021/03/16
- [PULL 09/13] hw/scsi: remove 'scsi-disk' device, Daniel P . Berrangé, 2021/03/16
- [PULL 10/13] block: remove 'encryption_key_missing' flag from QAPI, Daniel P . Berrangé, 2021/03/16
- [PULL 11/13] block: remove dirty bitmaps 'status' field, Daniel P . Berrangé, 2021/03/16
- [PULL 12/13] block: remove 'dirty-bitmaps' field from 'BlockInfo' struct, Daniel P . Berrangé, 2021/03/16