From nobody Tue Feb 10 12:42:21 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 1522078291033466.5841450315571; Mon, 26 Mar 2018 08:31:31 -0700 (PDT) Received: from localhost ([::1]:57391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0U5q-0007nB-4f for importer@patchew.org; Mon, 26 Mar 2018 11:31:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0Tl0-0005St-Me for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:09:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0Tkz-0002u1-Ei for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:09:58 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52740 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 1f0Tkz-0002tl-9E for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:09:57 -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 E558F8182D01; Mon, 26 Mar 2018 15:09:56 +0000 (UTC) Received: from localhost (ovpn-112-61.ams2.redhat.com [10.36.112.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 999F27C50; Mon, 26 Mar 2018 15:09:56 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2018 17:08:52 +0200 Message-Id: <20180326150916.9602-15-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.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.8]); Mon, 26 Mar 2018 15:09:56 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 26 Mar 2018 15:09:56 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.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 14/38] monitor: simplify monitor_qmp_respond() 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" Since the error path is at a single location, we can create the response object there, simplifying argument handling. While at it, also simplify id ownership: no need for the extra reference count. Signed-off-by: Marc-Andr=C3=A9 Lureau --- monitor.c | 58 ++++++++++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/monitor.c b/monitor.c index e9d0c4d172..0d01e17398 100644 --- a/monitor.c +++ b/monitor.c @@ -3899,46 +3899,27 @@ static int monitor_can_read(void *opaque) return !atomic_mb_read(&mon->suspend_cnt); } =20 -/* - * 1. This function takes ownership of rsp, err, and id. - * 2. rsp, err, and id may be NULL. - * 3. If err !=3D NULL then rsp must be NULL. - */ -static void monitor_qmp_respond(Monitor *mon, QObject *rsp, - Error *err, QObject *id) +/* take the ownership of rsp & id */ +static void monitor_qmp_respond(Monitor *mon, QObject *rsp, QObject *id) { - QDict *qdict =3D NULL; - - if (err) { - assert(!rsp); - qdict =3D qdict_new(); - qdict_put_obj(qdict, "error", qmp_build_error_object(err)); - error_free(err); - rsp =3D QOBJECT(qdict); - } - - if (rsp) { - if (id) { - /* This is for the qdict below. */ - qobject_incref(id); - qdict_put_obj(qobject_to(QDict, rsp), "id", id); - } + if (!rsp) { + return; + } =20 - if (mon->qmp.commands =3D=3D &qmp_cap_negotiation_commands) { - qdict =3D qdict_get_qdict(qobject_to(QDict, rsp), "error"); - if (qdict - && !g_strcmp0(qdict_get_try_str(qdict, "class"), + if (id) { + qdict_put_obj(qobject_to(QDict, rsp), "id", id); + } + if (mon->qmp.commands =3D=3D &qmp_cap_negotiation_commands) { + QDict *qdict =3D qdict_get_qdict(qobject_to(QDict, rsp), "error"); + if (qdict + && !g_strcmp0(qdict_get_try_str(qdict, "class"), QapiErrorClass_str(ERROR_CLASS_COMMAND_NOT_FOUND= ))) { - /* Provide a more useful error message */ - qdict_put_str(qdict, "desc", "Expecting capabilities" - " negotiation with 'qmp_capabilities'"); - } + /* Provide a more useful error message */ + qdict_put_str(qdict, "desc", "Expecting capabilities" + " negotiation with 'qmp_capabilities'"); } - - monitor_json_emitter(mon, rsp); } - - qobject_decref(id); + monitor_json_emitter(mon, rsp); qobject_decref(rsp); } =20 @@ -3981,7 +3962,7 @@ static void monitor_qmp_dispatch_one(QMPRequest *req_= obj) cur_mon =3D old_mon; =20 /* Respond if necessary */ - monitor_qmp_respond(mon, rsp, NULL, id); + monitor_qmp_respond(mon, rsp, id); =20 qobject_decref(req); } @@ -4131,7 +4112,10 @@ static void handle_qmp_command(JSONMessageParser *pa= rser, GQueue *tokens) return; =20 err: - monitor_qmp_respond(mon, NULL, err, NULL); + qdict =3D qdict_new(); + qdict_put_obj(qdict, "error", qmp_build_error_object(err)); + error_free(err); + monitor_qmp_respond(mon, QOBJECT(qdict), id); qobject_decref(req); } =20 --=20 2.17.0.rc1.1.g4c4f2b46a3