[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 3/4] monitor: remove "x-oob", turn oob on by defaul
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC v2 3/4] monitor: remove "x-oob", turn oob on by default |
Date: |
Thu, 31 May 2018 13:16:40 +0800 |
There was a regression reported by Eric Auger before with OOB:
http://lists.gnu.org/archive/html/qemu-devel/2018-03/msg06231.html
The fix is 951702f39c ("monitor: bind dispatch bh to iohandler context",
2018-04-10), which is in master already.
For the bug, we turned Out-Of-Band feature of monitors off for 2.12
release. Now we turn that on again after the 2.12 release.
This patch partly reverts be933ffc23 (monitor: new parameter "x-oob"),
meanwhile turn it on again by default for non-MUX QMPs.
Signed-off-by: Peter Xu <address@hidden>
---
include/monitor/monitor.h | 1 -
monitor.c | 17 +----------------
tests/qmp-test.c | 2 +-
vl.c | 5 -----
4 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index d6ab70cae2..0cb0538a31 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -13,7 +13,6 @@ extern Monitor *cur_mon;
#define MONITOR_USE_READLINE 0x02
#define MONITOR_USE_CONTROL 0x04
#define MONITOR_USE_PRETTY 0x08
-#define MONITOR_USE_OOB 0x10
bool monitor_cur_is_qmp(void);
diff --git a/monitor.c b/monitor.c
index 46814af533..f6f74239ad 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4558,19 +4558,7 @@ void monitor_init(Chardev *chr, int flags)
{
Monitor *mon = g_malloc(sizeof(*mon));
bool use_readline = flags & MONITOR_USE_READLINE;
- bool use_oob = flags & MONITOR_USE_OOB;
-
- if (use_oob) {
- if (CHARDEV_IS_MUX(chr)) {
- error_report("Monitor Out-Of-Band is not supported with "
- "MUX typed chardev backend");
- exit(1);
- }
- if (use_readline) {
- error_report("Monitor Out-Of-band is only supported by QMP");
- exit(1);
- }
- }
+ bool use_oob = (flags & MONITOR_USE_CONTROL) && !CHARDEV_IS_MUX(chr);
monitor_data_init(mon, false, use_oob);
@@ -4672,9 +4660,6 @@ QemuOptsList qemu_mon_opts = {
},{
.name = "pretty",
.type = QEMU_OPT_BOOL,
- },{
- .name = "x-oob",
- .type = QEMU_OPT_BOOL,
},
{ /* end of list */ }
},
diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index 88f867f8c0..c85a3964d9 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -89,7 +89,7 @@ static void test_qmp_protocol(void)
g_assert(q);
test_version(qdict_get(q, "version"));
capabilities = qdict_get_qlist(q, "capabilities");
- g_assert(capabilities && qlist_empty(capabilities));
+ g_assert(capabilities);
qobject_unref(resp);
/* Test valid command before handshake */
diff --git a/vl.c b/vl.c
index 038d7f8042..35e94a7032 100644
--- a/vl.c
+++ b/vl.c
@@ -2402,11 +2402,6 @@ static int mon_init_func(void *opaque, QemuOpts *opts,
Error **errp)
if (qemu_opt_get_bool(opts, "pretty", 0))
flags |= MONITOR_USE_PRETTY;
- /* OOB is off by default */
- if (qemu_opt_get_bool(opts, "x-oob", 0)) {
- flags |= MONITOR_USE_OOB;
- }
-
chardev = qemu_opt_get(opts, "chardev");
chr = qemu_chr_find(chardev);
if (chr == NULL) {
--
2.17.0
- [Qemu-devel] [RFC v2 0/4] monitor: enable OOB by default, Peter Xu, 2018/05/31
- [Qemu-devel] [RFC v2 1/4] docs: mention shared state protect for OOB, Peter Xu, 2018/05/31
- [Qemu-devel] [RFC v2 3/4] monitor: remove "x-oob", turn oob on by default,
Peter Xu <=
- [Qemu-devel] [RFC v2 2/4] tests: iotests: don't compare SHUTDOWN event, Peter Xu, 2018/05/31
- [Qemu-devel] [RFC v2 4/4] Revert "tests: Add parameter to qtest_init_without_qmp_handshake", Peter Xu, 2018/05/31
- Re: [Qemu-devel] [RFC v2 0/4] monitor: enable OOB by default, Peter Xu, 2018/05/31