[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/16] vl: Deprecate -mon pretty=... for HMP monitors
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 16/16] vl: Deprecate -mon pretty=... for HMP monitors |
Date: |
Mon, 17 Jun 2019 20:49:03 +0200 |
From: Kevin Wolf <address@hidden>
The -mon pretty=on|off switch of the -mon option applies only to QMP
monitors. It's silently ignored for HMP. Deprecate this combination so
that we can make it an error in future versions.
Signed-off-by: Kevin Wolf <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <address@hidden>
---
qemu-deprecated.texi | 6 ++++++
vl.c | 10 +++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index 50292d820b..df04f2840b 100644
--- a/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@ -72,6 +72,12 @@ backend settings instead of environment variables. To ease
migration to
the new format, the ``-audiodev-help'' option can be used to convert
the current values of the environment variables to ``-audiodev'' options.
+@subsection -mon ...,control=readline,pretty=on|off (since 4.1)
+
+The @code{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.
+
@subsection -realtime (since 4.1)
The @code{-realtime mlock=on|off} argument has been replaced by the
diff --git a/vl.c b/vl.c
index 32daa434eb..99a56b5556 100644
--- a/vl.c
+++ b/vl.c
@@ -2317,6 +2317,10 @@ static int mon_init_func(void *opaque, QemuOpts *opts,
Error **errp)
return -1;
}
+ if (!qmp && qemu_opt_get(opts, "pretty")) {
+ warn_report("'pretty' is deprecated for HMP monitors, it has no effect
"
+ "and will be removed in future versions");
+ }
if (qemu_opt_get_bool(opts, "pretty", 0)) {
pretty = true;
}
@@ -2362,7 +2366,11 @@ static void monitor_parse(const char *optarg, const char
*mode, bool pretty)
opts = qemu_opts_create(qemu_find_opts("mon"), label, 1, &error_fatal);
qemu_opt_set(opts, "mode", mode, &error_abort);
qemu_opt_set(opts, "chardev", label, &error_abort);
- qemu_opt_set_bool(opts, "pretty", pretty, &error_abort);
+ if (!strcmp(mode, "control")) {
+ qemu_opt_set_bool(opts, "pretty", pretty, &error_abort);
+ } else {
+ assert(pretty == false);
+ }
monitor_device_index++;
}
--
2.21.0
- [Qemu-devel] [PULL 01/16] monitor: Fix return type of monitor_fdset_dup_fd_find, (continued)
- [Qemu-devel] [PULL 01/16] monitor: Fix return type of monitor_fdset_dup_fd_find, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 04/16] monitor: Make MonitorQMP a child class of Monitor, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 09/16] monitor: Move {hmp, qmp}.c to monitor/{hmp, qmp}-cmds.c, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 08/16] Move monitor.c to monitor/misc.c, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 14/16] monitor: Split Monitor.flags into separate bools, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 06/16] monitor: Remove Monitor.cmd_table indirection, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 02/16] monitor: Remove unused password prompting fields, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 11/16] monitor: Split out monitor/qmp.c, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 15/16] monitor: Replace monitor_init() with monitor_init_{hmp, qmp}(), Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 05/16] monitor: Create MonitorHMP with readline state, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 16/16] vl: Deprecate -mon pretty=... for HMP monitors,
Markus Armbruster <=
[Qemu-devel] [PULL 07/16] monitor: Rename HMP command type and tables, Markus Armbruster, 2019/06/17
[Qemu-devel] [PULL 13/16] monitor: Split out monitor/monitor.c, Markus Armbruster, 2019/06/17
[Qemu-devel] [PULL 12/16] monitor: Split out monitor/hmp.c, Markus Armbruster, 2019/06/17
[Qemu-devel] [PULL 10/16] monitor: Create monitor-internal.h with common definitions, Markus Armbruster, 2019/06/17
Re: [Qemu-devel] [PULL 00/16] Monitor patches for 2019-06-17, Peter Maydell, 2019/06/17