From nobody Tue Feb 10 12:42:32 2026 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 1522077568793452.2325849653904; Mon, 26 Mar 2018 08:19:28 -0700 (PDT) Received: from localhost ([::1]:57321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0Tu8-0005GO-Gn for importer@patchew.org; Mon, 26 Mar 2018 11:19:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0Tkd-00055V-LZ for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:09:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0Tkc-0002hk-Nl for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:09:35 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36624 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 1f0Tkc-0002hK-K5 for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:09:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4362C40711B2; Mon, 26 Mar 2018 15:09:34 +0000 (UTC) Received: from localhost (ovpn-112-61.ams2.redhat.com [10.36.112.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1BFB215CDAE; Mon, 26 Mar 2018 15:09:33 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2018 17:08:43 +0200 Message-Id: <20180326150916.9602-6-marcandre.lureau@redhat.com> In-Reply-To: <20180326150916.9602-1-marcandre.lureau@redhat.com> References: <20180326150916.9602-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 26 Mar 2018 15:09:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 26 Mar 2018 15:09:34 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'marcandre.lureau@redhat.com' RCPT:'' Content-Transfer-Encoding: quoted-printable 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 v3 05/38] monitor: further simplify previous patch 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: Eduardo Habkost , Juan Quintela , Markus Armbruster , "Dr. David Alan Gilbert" , Gerd Hoffmann , Cleber Rosa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move the resume code to the non-oob path. This patch could eventually be squashed with the previous patch. Signed-off-by: Marc-Andr=C3=A9 Lureau --- monitor.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/monitor.c b/monitor.c index 2428c7fcd4..a8dcfa283e 100644 --- a/monitor.c +++ b/monitor.c @@ -3957,16 +3957,14 @@ typedef struct QMPRequest QMPRequest; * Dispatch one single QMP request. The function will free the req_obj * and objects inside it before return. */ -static void monitor_qmp_dispatch_one(QMPRequest *req_obj, bool oob_cmd) +static void monitor_qmp_dispatch_one(QMPRequest *req_obj) { Monitor *mon, *old_mon; QObject *req, *rsp =3D NULL, *id; - bool need_resume; =20 req =3D req_obj->req; mon =3D req_obj->mon; id =3D req_obj->id; - need_resume =3D !oob_cmd && !qmp_oob_enabled(mon); =20 g_free(req_obj); =20 @@ -3986,11 +3984,6 @@ static void monitor_qmp_dispatch_one(QMPRequest *req= _obj, bool oob_cmd) /* Respond if necessary */ monitor_qmp_respond(mon, rsp, NULL, id); =20 - /* This pairs with the monitor_suspend() in handle_qmp_command(). */ - if (need_resume) { - monitor_resume(mon); - } - qobject_decref(req); } =20 @@ -4036,8 +4029,14 @@ static void monitor_qmp_bh_dispatcher(void *data) QMPRequest *req_obj =3D monitor_qmp_requests_pop_one(); =20 if (req_obj) { + Monitor *mon =3D req_obj->mon; + bool need_resume =3D !qmp_oob_enabled(mon); trace_monitor_qmp_cmd_in_band(qobject_get_try_str(req_obj->id) ?: = ""); - monitor_qmp_dispatch_one(req_obj, false); + monitor_qmp_dispatch_one(req_obj); + /* This pairs with the monitor_suspend() in handle_qmp_command(). = */ + if (need_resume) { + monitor_resume(mon); + } /* Reschedule instead of looping so the main loop stays responsive= */ qemu_bh_schedule(mon_global.qmp_dispatcher_bh); } @@ -4095,7 +4094,7 @@ static void handle_qmp_command(JSONMessageParser *par= ser, GQueue *tokens) /* Out-Of-Band (OOB) requests are executed directly in parser. */ trace_monitor_qmp_cmd_out_of_band(qobject_get_try_str(req_obj->id) ?: ""); - monitor_qmp_dispatch_one(req_obj, true); + monitor_qmp_dispatch_one(req_obj); return; } =20 --=20 2.17.0.rc1.1.g4c4f2b46a3