aboutsummaryrefslogtreecommitdiff
path: root/monitor/monitor.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2020-02-24 15:30:07 +0100
committerKevin Wolf <kwolf@redhat.com>2020-03-06 17:21:28 +0100
commita2f411c4671b0b6cfe5f3b91b65d9bc8456e75ab (patch)
tree1e77f49e02ffe116c3f8e57dade4ee22328269e7 /monitor/monitor.c
parent8e9119a807df510f0d2ce4cdda3078166d6e99a7 (diff)
downloadqemu-a2f411c4671b0b6cfe5f3b91b65d9bc8456e75ab.zip
qemu-a2f411c4671b0b6cfe5f3b91b65d9bc8456e75ab.tar.gz
qemu-a2f411c4671b0b6cfe5f3b91b65d9bc8456e75ab.tar.bz2
monitor: Add allow_hmp parameter to monitor_init()
Add a new parameter allow_hmp to monitor_init() so that the storage daemon can disable HMP. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20200224143008.13362-20-kwolf@redhat.com> Acked-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'monitor/monitor.c')
-rw-r--r--monitor/monitor.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 2282bf6..1254944 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -611,7 +611,7 @@ void monitor_init_globals_core(void)
NULL);
}
-int monitor_init(MonitorOptions *opts, Error **errp)
+int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp)
{
Chardev *chr;
Error *local_err = NULL;
@@ -622,11 +622,19 @@ int monitor_init(MonitorOptions *opts, Error **errp)
return -1;
}
+ if (!opts->has_mode) {
+ opts->mode = allow_hmp ? MONITOR_MODE_READLINE : MONITOR_MODE_CONTROL;
+ }
+
switch (opts->mode) {
case MONITOR_MODE_CONTROL:
monitor_init_qmp(chr, opts->pretty, &local_err);
break;
case MONITOR_MODE_READLINE:
+ if (!allow_hmp) {
+ error_setg(errp, "Only QMP is supported");
+ return -1;
+ }
if (opts->pretty) {
warn_report("'pretty' is deprecated for HMP monitors, it has no "
"effect and will be removed in future versions");
@@ -658,7 +666,7 @@ int monitor_init_opts(QemuOpts *opts, Error **errp)
goto out;
}
- monitor_init(options, &local_err);
+ monitor_init(options, true, &local_err);
qapi_free_MonitorOptions(options);
out: