From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKgPQ-0006MT-9m for qemu-devel@nongnu.org; Mon, 21 May 2018 04:43:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKgPM-0006dA-BW for qemu-devel@nongnu.org; Mon, 21 May 2018 04:43:12 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57932 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fKgPM-0006cx-7A for qemu-devel@nongnu.org; Mon, 21 May 2018 04:43:08 -0400 From: Peter Xu Date: Mon, 21 May 2018 16:42:49 +0800 Message-Id: <20180521084249.10640-1-peterx@redhat.com> Subject: [Qemu-devel] [RFC] monitor: turn on Out-Of-Band by default again List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Daniel P . Berrange" , Christian Borntraeger , Fam Zheng , Kevin Wolf , Max Reitz , peterx@redhat.com, Eric Auger , Eric Blake , John Snow , Peter Maydell , Markus Armbruster We turned Out-Of-Band feature of monitors off for 2.12 release. Now we try to turn that on again. Signed-off-by: Peter Xu -- Now OOB should be okay with all known tests (except iotest qcow2, since it is still broken on master), and AFAIK now we should also be okay with ARM+Libvirt (not testsed, but Eric Auger helped to verify that before the release). So I think it's now safe to turn OOB on again. Please feel free to test this against any of existing testsuites to see whether it'll still break any stuff. Thanks, Signed-off-by: Peter Xu --- monitor.c | 13 +++---------- tests/qmp-test.c | 2 +- vl.c | 9 ++++----- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/monitor.c b/monitor.c index 46814af533..ce5cc5e34e 100644 --- a/monitor.c +++ b/monitor.c @@ -4560,16 +4560,9 @@ void monitor_init(Chardev *chr, int flags) 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); - } + if (CHARDEV_IS_MUX(chr)) { + /* MUX is still not supported for Out-Of-Band */ + use_oob = false; } monitor_data_init(mon, false, use_oob); 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 3b39bbd7a8..b71fb8eb25 100644 --- a/vl.c +++ b/vl.c @@ -2394,6 +2394,10 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp) flags = MONITOR_USE_READLINE; } else if (strcmp(mode, "control") == 0) { flags = MONITOR_USE_CONTROL; + /* Out-Of-Band is on by default */ + if (qemu_opt_get_bool(opts, "x-oob", 1)) { + flags |= MONITOR_USE_OOB; + } } else { error_report("unknown monitor mode \"%s\"", mode); exit(1); @@ -2402,11 +2406,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