From nobody Tue Feb 10 15:01:34 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; 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 1529386623624293.1534122350996; Mon, 18 Jun 2018 22:37:03 -0700 (PDT) Received: from localhost ([::1]:39506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV9K8-0006TO-QK for importer@patchew.org; Tue, 19 Jun 2018 01:37:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV9I5-0005Ii-JG for qemu-devel@nongnu.org; Tue, 19 Jun 2018 01:34:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fV9I4-0003dU-Of for qemu-devel@nongnu.org; Tue, 19 Jun 2018 01:34:53 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33402 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 1fV9I4-0003dA-KU for qemu-devel@nongnu.org; Tue, 19 Jun 2018 01:34:52 -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 2D45D818BAF3; Tue, 19 Jun 2018 05:34:52 +0000 (UTC) Received: from xz-mi.redhat.com (ovpn-12-87.pek2.redhat.com [10.72.12.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id C05D42026D5B; Tue, 19 Jun 2018 05:34:44 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Tue, 19 Jun 2018 13:34:21 +0800 Message-Id: <20180619053426.13065-3-peterx@redhat.com> In-Reply-To: <20180619053426.13065-1-peterx@redhat.com> References: <20180619053426.13065-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.8]); Tue, 19 Jun 2018 05:34:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 19 Jun 2018 05:34:52 +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 v4 2/7] monitor: rename *_pop_one to *_pop_any 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 , Thomas Huth , Fam Zheng , Eric Auger , John Snow , peterx@redhat.com, Max Reitz , Christian Borntraeger , "Dr . David Alan Gilbert" , Stefan Hajnoczi , =?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" The old names are confusing since both of the old functions are poping an item from multiple queues rather than a single queue. In that sense, *_pop_any() suites better than *_pop_one(). Since at it, touch up the function monitor_qmp_response_pop_any() a bit to let the callers pass in a QMPResponse struct instead of returning a struct. Change the return value to boolean to mark whether we have poped a valid response instead. Suggested-by: Markus Armbruster Signed-off-by: Peter Xu Reviewed-by: Markus Armbruster --- monitor.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/monitor.c b/monitor.c index 6d0cec552e..d4a463f707 100644 --- a/monitor.c +++ b/monitor.c @@ -513,10 +513,10 @@ struct QMPResponse { typedef struct QMPResponse QMPResponse; =20 /* - * Return one QMPResponse. The response is only valid if - * response.data is not NULL. + * Pop a QMPResponse from any monitor's response queue into @response. + * Return false if all the queues are empty; else true. */ -static QMPResponse monitor_qmp_response_pop_one(void) +static bool monitor_qmp_response_pop_any(QMPResponse *response) { Monitor *mon; QObject *data =3D NULL; @@ -527,22 +527,20 @@ static QMPResponse monitor_qmp_response_pop_one(void) data =3D g_queue_pop_head(mon->qmp.qmp_responses); qemu_mutex_unlock(&mon->qmp.qmp_queue_lock); if (data) { + response->mon =3D mon; + response->data =3D data; break; } } qemu_mutex_unlock(&monitor_lock); - return (QMPResponse) { .mon =3D mon, .data =3D data }; + return data !=3D NULL; } =20 static void monitor_qmp_bh_responder(void *opaque) { QMPResponse response; =20 - while (true) { - response =3D monitor_qmp_response_pop_one(); - if (!response.data) { - break; - } + while (monitor_qmp_response_pop_any(&response)) { monitor_json_emitter_raw(response.mon, response.data); qobject_unref(response.data); } @@ -4107,7 +4105,7 @@ static void monitor_qmp_dispatch_one(QMPRequest *req_= obj) * when we process one request on a specific monitor, we put that * monitor to the end of mon_list queue. */ -static QMPRequest *monitor_qmp_requests_pop_one(void) +static QMPRequest *monitor_qmp_requests_pop_any(void) { QMPRequest *req_obj =3D NULL; Monitor *mon; @@ -4139,7 +4137,7 @@ static QMPRequest *monitor_qmp_requests_pop_one(void) =20 static void monitor_qmp_bh_dispatcher(void *data) { - QMPRequest *req_obj =3D monitor_qmp_requests_pop_one(); + QMPRequest *req_obj =3D monitor_qmp_requests_pop_any(); =20 if (req_obj) { trace_monitor_qmp_cmd_in_band(qobject_get_try_str(req_obj->id) ?: = ""); --=20 2.17.1