From nobody Tue May 7 06:56:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152689225014986.73363668975969; Mon, 21 May 2018 01:44:10 -0700 (PDT) Received: from localhost ([::1]:49364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKgQF-0007CJ-9g for importer@patchew.org; Mon, 21 May 2018 04:44:03 -0400 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 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4015C40122A0; Mon, 21 May 2018 08:43:07 +0000 (UTC) Received: from xz-mi.redhat.com (ovpn-12-119.pek2.redhat.com [10.72.12.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id E61D75032C; Mon, 21 May 2018 08:42:50 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Mon, 21 May 2018 16:42:49 +0800 Message-Id: <20180521084249.10640-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 21 May 2018 08:43:07 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 21 May 2018 08:43:07 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'peterx@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [RFC] monitor: turn on Out-Of-Band by default again X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , Fam Zheng , Eric Auger , John Snow , peterx@redhat.com, Max Reitz , Christian Borntraeger , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =3D flags & MONITOR_USE_READLINE; bool use_oob =3D flags & MONITOR_USE_OOB; =20 - 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 =3D false; } =20 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 =3D qdict_get_qlist(q, "capabilities"); - g_assert(capabilities && qlist_empty(capabilities)); + g_assert(capabilities); qobject_unref(resp); =20 /* 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 *opt= s, Error **errp) flags =3D MONITOR_USE_READLINE; } else if (strcmp(mode, "control") =3D=3D 0) { flags =3D MONITOR_USE_CONTROL; + /* Out-Of-Band is on by default */ + if (qemu_opt_get_bool(opts, "x-oob", 1)) { + flags |=3D 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 *opt= s, Error **errp) if (qemu_opt_get_bool(opts, "pretty", 0)) flags |=3D MONITOR_USE_PRETTY; =20 - /* OOB is off by default */ - if (qemu_opt_get_bool(opts, "x-oob", 0)) { - flags |=3D MONITOR_USE_OOB; - } - chardev =3D qemu_opt_get(opts, "chardev"); chr =3D qemu_chr_find(chardev); if (chr =3D=3D NULL) { --=20 2.17.0