summaryrefslogtreecommitdiffstats
path: root/include/monitor
diff options
context:
space:
mode:
authorPeter Xu2018-10-09 08:27:15 +0200
committerMarkus Armbruster2018-12-12 10:28:27 +0100
commit8258292e18c39480b64eba9f3551ab772ce29b5d (patch)
treec2e842bf2e48ff34e2b8b3fdd681ab48aeff1666 /include/monitor
parentmonitor: Suspend monitor instead dropping commands (diff)
downloadqemu-8258292e18c39480b64eba9f3551ab772ce29b5d.tar.gz
qemu-8258292e18c39480b64eba9f3551ab772ce29b5d.tar.xz
qemu-8258292e18c39480b64eba9f3551ab772ce29b5d.zip
monitor: Remove "x-oob", offer capability "oob" unconditionally
Out-of-band command execution was introduced in commit cf869d53172. Unfortunately, we ran into a regression, and had to turn it into an experimental option for 2.12 (commit be933ffc23). http://lists.gnu.org/archive/html/qemu-devel/2018-03/msg06231.html The regression has since been fixed (commit 951702f39c7 "monitor: bind dispatch bh to iohandler context"). A thorough re-review of OOB commands led to a few more issues, which have also been addressed. This patch partly reverts be933ffc23 (monitor: new parameter "x-oob"), and makes QMP monitors again offer capability "oob" whenever they can provide it, i.e. when the monitor's character device is capable of running in an I/O thread. Some trivial touch-up in the test code is required to make sure qmp-test won't break. Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20181009062718.1914-4-peterx@redhat.com> [Conflict with "monitor: check if chardev can switch gcontext for OOB" resolved, commit message updated] Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'include/monitor')
-rw-r--r--include/monitor/monitor.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 0c0a37d8cb..c1b40a9cac 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -13,7 +13,6 @@ extern __thread Monitor *cur_mon;
#define MONITOR_USE_READLINE 0x02
#define MONITOR_USE_CONTROL 0x04
#define MONITOR_USE_PRETTY 0x08
-#define MONITOR_USE_OOB 0x10
#define QMP_REQ_QUEUE_LEN_MAX 8