From nobody Sun Apr 28 12:02:45 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15218142549501011.0774339814958; Fri, 23 Mar 2018 07:10:54 -0700 (PDT) Received: from localhost ([::1]:38236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNPB-0000Py-UV for importer@patchew.org; Fri, 23 Mar 2018 10:10:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNNT-0007Hy-No for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezNNP-00058N-2y for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:07 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49910 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 1ezNNO-00057z-V2 for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 713CB77068; Fri, 23 Mar 2018 14:09:02 +0000 (UTC) Received: from xz-mi.redhat.com (ovpn-12-68.pek2.redhat.com [10.72.12.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 275812023233; Fri, 23 Mar 2018 14:08:54 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 23 Mar 2018 22:08:18 +0800 Message-Id: <20180323140821.28957-2-peterx@redhat.com> In-Reply-To: <20180323140821.28957-1-peterx@redhat.com> References: <20180323140821.28957-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 23 Mar 2018 14:09:02 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 23 Mar 2018 14:09:02 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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] [PATCH for-2.12 1/4] Revert "monitor: enable IO thread for (qmp & !mux) typed" 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?= , Paolo Bonzini , 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" This reverts commit 3fd2457d18edf5736f713dfe1ada9c87a9badab1. Signed-off-by: Peter Xu Acked-by: Eric Blake Tested-by: Christian Borntraeger --- monitor.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index 6ccd2fc089..77f4c41cfa 100644 --- a/monitor.c +++ b/monitor.c @@ -36,7 +36,6 @@ #include "net/slirp.h" #include "chardev/char-fe.h" #include "chardev/char-io.h" -#include "chardev/char-mux.h" #include "ui/qemu-spice.h" #include "sysemu/numa.h" #include "monitor/monitor.h" @@ -4537,10 +4536,8 @@ static void monitor_qmp_setup_handlers_bh(void *opaq= ue) void monitor_init(Chardev *chr, int flags) { Monitor *mon =3D g_malloc(sizeof(*mon)); - /* Enable IOThread for QMPs that are not using MUX chardev backends. */ - bool use_io_thr =3D (!CHARDEV_IS_MUX(chr)) && (flags & MONITOR_USE_CON= TROL); =20 - monitor_data_init(mon, false, use_io_thr); + monitor_data_init(mon, false, false); =20 qemu_chr_fe_init(&mon->chr, chr, &error_abort); mon->flags =3D flags; --=20 2.14.3 From nobody Sun Apr 28 12:02:45 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521814259656279.53940709516087; Fri, 23 Mar 2018 07:10:59 -0700 (PDT) Received: from localhost ([::1]:38237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNPD-0000S8-R6 for importer@patchew.org; Fri, 23 Mar 2018 10:10:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNNd-0007OB-A6 for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezNNY-0005DM-Uc for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:17 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:35866 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 1ezNNY-0005D2-PL for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5E357722D3; Fri, 23 Mar 2018 14:09:12 +0000 (UTC) Received: from xz-mi.redhat.com (ovpn-12-68.pek2.redhat.com [10.72.12.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51EAE2023233; Fri, 23 Mar 2018 14:09:02 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 23 Mar 2018 22:08:19 +0800 Message-Id: <20180323140821.28957-3-peterx@redhat.com> In-Reply-To: <20180323140821.28957-1-peterx@redhat.com> References: <20180323140821.28957-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 23 Mar 2018 14:09:12 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 23 Mar 2018 14:09:12 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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] [PATCH for-2.12 2/4] Revert "tests: qmp-test: add oob test" 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?= , Paolo Bonzini , 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" This reverts commit d003f7a8f9cafe50119975844fa01afc2baf41fb. Signed-off-by: Peter Xu Acked-by: Eric Blake Tested-by: Christian Borntraeger --- tests/qmp-test.c | 65 ----------------------------------------------------= ---- 1 file changed, 65 deletions(-) diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 07c0b87e27..2e4b599a4c 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -164,70 +164,6 @@ static void test_qmp_protocol(void) qtest_quit(qts); } =20 -/* Tests for Out-Of-Band support. */ -static void test_qmp_oob(void) -{ - QDict *resp; - int acks =3D 0; - const char *cmd_id; - - global_qtest =3D qtest_init_without_qmp_handshake(common_args); - - /* Ignore the greeting message. */ - resp =3D qmp_receive(); - g_assert(qdict_get_qdict(resp, "QMP")); - QDECREF(resp); - - /* Try a fake capability, it should fail. */ - resp =3D qmp("{ 'execute': 'qmp_capabilities', " - " 'arguments': { 'enable': [ 'cap-does-not-exist' ] } }"); - g_assert(qdict_haskey(resp, "error")); - QDECREF(resp); - - /* Now, enable OOB in current QMP session, it should succeed. */ - resp =3D qmp("{ 'execute': 'qmp_capabilities', " - " 'arguments': { 'enable': [ 'oob' ] } }"); - g_assert(qdict_haskey(resp, "return")); - QDECREF(resp); - - /* - * Try any command that does not support OOB but with OOB flag. We - * should get failure. - */ - resp =3D qmp("{ 'execute': 'query-cpus'," - " 'control': { 'run-oob': true } }"); - g_assert(qdict_haskey(resp, "error")); - QDECREF(resp); - - /* - * First send the "x-oob-test" command with lock=3Dtrue and - * oob=3Dfalse, it should hang the dispatcher and main thread; - * later, we send another lock=3Dfalse with oob=3Dtrue to continue - * that thread processing. Finally we should receive replies from - * both commands. - */ - qmp_async("{ 'execute': 'x-oob-test'," - " 'arguments': { 'lock': true }, " - " 'id': 'lock-cmd'}"); - qmp_async("{ 'execute': 'x-oob-test', " - " 'arguments': { 'lock': false }, " - " 'control': { 'run-oob': true }, " - " 'id': 'unlock-cmd' }"); - - /* Ignore all events. Wait for 2 acks */ - while (acks < 2) { - resp =3D qmp_receive(); - cmd_id =3D qdict_get_str(resp, "id"); - if (!g_strcmp0(cmd_id, "lock-cmd") || - !g_strcmp0(cmd_id, "unlock-cmd")) { - acks++; - } - QDECREF(resp); - } - - qtest_end(); -} - static int query_error_class(const char *cmd) { static struct { @@ -412,7 +348,6 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); =20 qtest_add_func("qmp/protocol", test_qmp_protocol); - qtest_add_func("qmp/oob", test_qmp_oob); qmp_schema_init(&schema); add_query_tests(&schema); =20 --=20 2.14.3 From nobody Sun Apr 28 12:02:45 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521814366916481.06631122904275; Fri, 23 Mar 2018 07:12:46 -0700 (PDT) Received: from localhost ([::1]:38243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNQv-0001ra-Lk for importer@patchew.org; Fri, 23 Mar 2018 10:12:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNNn-0007YB-1D for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezNNj-0005Jp-SN for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:26 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49924 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 1ezNNj-0005Im-PG for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:23 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7536177068; Fri, 23 Mar 2018 14:09:23 +0000 (UTC) Received: from xz-mi.redhat.com (ovpn-12-68.pek2.redhat.com [10.72.12.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A6D92023233; Fri, 23 Mar 2018 14:09:12 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 23 Mar 2018 22:08:20 +0800 Message-Id: <20180323140821.28957-4-peterx@redhat.com> In-Reply-To: <20180323140821.28957-1-peterx@redhat.com> References: <20180323140821.28957-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 23 Mar 2018 14:09:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 23 Mar 2018 14:09:23 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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] [PATCH for-2.12 3/4] Revert "tests: qmp-test: verify command batching" 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?= , Paolo Bonzini , 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" This reverts commit 91ad45061af0fe44ac5dadb5bedaf4d7a08077c8. Signed-off-by: Peter Xu Acked-by: Eric Blake Tested-by: Christian Borntraeger --- tests/qmp-test.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 2e4b599a4c..d1fa1cb217 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -82,7 +82,6 @@ static void test_qmp_protocol(void) QTestState *qts; const QListEntry *entry; QString *qstr; - int i; =20 qts =3D qtest_init_without_qmp_handshake(common_args); =20 @@ -140,27 +139,6 @@ static void test_qmp_protocol(void) g_assert_cmpint(qdict_get_int(resp, "id"), =3D=3D, 2); QDECREF(resp); =20 - /* - * Test command batching. In current test OOB is not enabled, we - * should be able to run as many commands in batch as we like. - * Using 16 (>8, which is OOB queue length) to make sure OOB won't - * break existing clients. Note: this test does not control the - * scheduling of QEMU's QMP command processing threads so it may - * not really trigger batching inside QEMU. This is just a - * best-effort test. - */ - for (i =3D 0; i < 16; i++) { - qtest_async_qmp(qts, "{ 'execute': 'query-version' }"); - } - /* Verify the replies to make sure no command is dropped. */ - for (i =3D 0; i < 16; i++) { - resp =3D qtest_qmp_receive(qts); - /* It should never be dropped. Each of them should be a reply. */ - g_assert(qdict_haskey(resp, "return")); - g_assert(!qdict_haskey(resp, "event")); - QDECREF(resp); - } - qtest_quit(qts); } =20 --=20 2.14.3 From nobody Sun Apr 28 12:02:45 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521814369587555.0389631843851; Fri, 23 Mar 2018 07:12:49 -0700 (PDT) Received: from localhost ([::1]:38244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNR2-0001yR-Q9 for importer@patchew.org; Fri, 23 Mar 2018 10:12:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNNv-0007qm-Ix for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezNNs-0005MY-DG for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:35 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40730 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 1ezNNs-0005MN-9H for qemu-devel@nongnu.org; Fri, 23 Mar 2018 10:09:32 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E9C03406F89C; Fri, 23 Mar 2018 14:09:31 +0000 (UTC) Received: from xz-mi.redhat.com (ovpn-12-68.pek2.redhat.com [10.72.12.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 829472023233; Fri, 23 Mar 2018 14:09:24 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 23 Mar 2018 22:08:21 +0800 Message-Id: <20180323140821.28957-5-peterx@redhat.com> In-Reply-To: <20180323140821.28957-1-peterx@redhat.com> References: <20180323140821.28957-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Mar 2018 14:09:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Mar 2018 14:09:31 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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] [PATCH for-2.12 4/4] tests: partly revert "qmp: introduce QMPCapability" 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?= , Paolo Bonzini , 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" Revert the tests in the patch 02130314d8 ("qmp: introduce QMPCapability", 2018-03-19) since we'll disable OOB for now. Signed-off-by: Peter Xu Acked-by: Eric Blake Tested-by: Christian Borntraeger --- tests/qmp-test.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/qmp-test.c b/tests/qmp-test.c index d1fa1cb217..558e83540c 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -80,8 +80,6 @@ static void test_qmp_protocol(void) QDict *resp, *q, *ret; QList *capabilities; QTestState *qts; - const QListEntry *entry; - QString *qstr; =20 qts =3D qtest_init_without_qmp_handshake(common_args); =20 @@ -91,13 +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); - entry =3D qlist_first(capabilities); - g_assert(entry); - qstr =3D qobject_to(QString, entry->value); - g_assert(qstr); - g_assert_cmpstr(qstring_get_str(qstr), =3D=3D, "oob"); - QDECREF(resp); + g_assert(capabilities && qlist_empty(capabilities)); =20 /* Test valid command before handshake */ resp =3D qtest_qmp(qts, "{ 'execute': 'query-version' }"); --=20 2.14.3