[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 25/29] monitor: Add allow_hmp parameter to monitor_init()
From: |
Kevin Wolf |
Subject: |
[PULL 25/29] monitor: Add allow_hmp parameter to monitor_init() |
Date: |
Fri, 6 Mar 2020 18:14:54 +0100 |
Add a new parameter allow_hmp to monitor_init() so that the storage
daemon can disable HMP.
Signed-off-by: Kevin Wolf <address@hidden>
Message-Id: <address@hidden>
Acked-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
qapi/control.json | 3 ++-
include/monitor/monitor.h | 2 +-
monitor/monitor.c | 12 ++++++++++--
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/qapi/control.json b/qapi/control.json
index 3ee086aec7..85b12fe0fb 100644
--- a/qapi/control.json
+++ b/qapi/control.json
@@ -237,7 +237,8 @@
#
# @id: Name of the monitor
#
-# @mode: Selects the monitor mode (default: readline)
+# @mode: Selects the monitor mode (default: readline in the system
+# emulator, control in qemu-storage-daemon)
#
# @pretty: Enables pretty printing (QMP only)
#
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index ad823b9edb..1018d754a6 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -19,7 +19,7 @@ void monitor_init_globals(void);
void monitor_init_globals_core(void);
void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp);
void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp);
-int monitor_init(MonitorOptions *opts, Error **errp);
+int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp);
int monitor_init_opts(QemuOpts *opts, Error **errp);
void monitor_cleanup(void);
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 2282bf6780..125494410a 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:
--
2.20.1
- [PULL 16/29] blockdev-nbd: Boxed argument type for nbd-server-add, (continued)
- [PULL 16/29] blockdev-nbd: Boxed argument type for nbd-server-add, Kevin Wolf, 2020/03/06
- [PULL 13/29] qapi: Flatten object-add, Kevin Wolf, 2020/03/06
- [PULL 15/29] qemu-storage-daemon: Add --nbd-server option, Kevin Wolf, 2020/03/06
- [PULL 19/29] qemu-storage-daemon: Add --chardev option, Kevin Wolf, 2020/03/06
- [PULL 18/29] qemu-storage-daemon: Add main loop, Kevin Wolf, 2020/03/06
- [PULL 22/29] monitor: Create QAPIfied monitor_init(), Kevin Wolf, 2020/03/06
- [PULL 21/29] qapi: Create 'pragma' module, Kevin Wolf, 2020/03/06
- [PULL 10/29] block: Move common QMP commands to block-core QAPI module, Kevin Wolf, 2020/03/06
- [PULL 12/29] qemu-storage-daemon: Add --blockdev option, Kevin Wolf, 2020/03/06
- [PULL 20/29] stubs: Update monitor stubs for qemu-storage-daemon, Kevin Wolf, 2020/03/06
- [PULL 25/29] monitor: Add allow_hmp parameter to monitor_init(),
Kevin Wolf <=
- [PULL 24/29] hmp: Fail gracefully if chardev is already in use, Kevin Wolf, 2020/03/06
- [PULL 09/29] block: Move system emulator QMP commands to block/qapi-sysemu.c, Kevin Wolf, 2020/03/06
- [PULL 17/29] qemu-storage-daemon: Add --export option, Kevin Wolf, 2020/03/06
- [PULL 23/29] qmp: Fail gracefully if chardev is already in use, Kevin Wolf, 2020/03/06
- [PULL 26/29] qemu-storage-daemon: Add --monitor option, Kevin Wolf, 2020/03/06
- [PULL 29/29] block: bdrv_reopen() with backing file in different AioContext, Kevin Wolf, 2020/03/06
- [PULL 11/29] block: Move sysemu QMP commands to QAPI block module, Kevin Wolf, 2020/03/06
- [PULL 28/29] iotests: Refactor blockdev-reopen test for iothreads, Kevin Wolf, 2020/03/06
- [PULL 27/29] block/rbd: Add support for ceph namespaces, Kevin Wolf, 2020/03/06
- Re: [PULL 00/29] Block layer patches, no-reply, 2020/03/06