summaryrefslogtreecommitdiffstats
path: root/monitor
diff options
context:
space:
mode:
authorDaniel P. Berrangé2021-02-19 18:56:13 +0100
committerDaniel P. Berrangé2021-03-18 10:22:55 +0100
commit283d845c9164f57f5dba020a4783bb290493802f (patch)
tree1084e0cac2bfd04266ebf4d3a413cb32f20a3a8c /monitor
parentui, monitor: remove deprecated VNC ACL option and HMP commands (diff)
downloadqemu-283d845c9164f57f5dba020a4783bb290493802f.tar.gz
qemu-283d845c9164f57f5dba020a4783bb290493802f.tar.xz
qemu-283d845c9164f57f5dba020a4783bb290493802f.zip
monitor: raise error when 'pretty' option is used with HMP
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>
Diffstat (limited to 'monitor')
-rw-r--r--monitor/monitor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 640496e562..636bcc81c5 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -716,8 +716,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;