From nobody Tue Feb 10 12:42:25 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 1522077692880976.5298435305954; Mon, 26 Mar 2018 08:21:32 -0700 (PDT) Received: from localhost ([::1]:57335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0TwB-0007L7-WE for importer@patchew.org; Mon, 26 Mar 2018 11:21:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0TlB-0005dX-5d for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:10:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0Tl7-0002xr-UB for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:10:09 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52750 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 1f0Tl7-0002xe-Og for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:10:05 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6764E8182D2E; Mon, 26 Mar 2018 15:10:05 +0000 (UTC) Received: from localhost (ovpn-112-61.ams2.redhat.com [10.36.112.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8885910B0F20; Mon, 26 Mar 2018 15:09:59 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2018 17:08:54 +0200 Message-Id: <20180326150916.9602-17-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.3 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:10:05 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 26 Mar 2018 15:10:05 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.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 16/38] qmp: move 'id' copy to qmp_dispatch() 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" This is convenient for other QMP users such as QGA and tests and simplifies a bit the qemu monitor code, and avoids modifying the request. Signed-off-by: Marc-Andr=C3=A9 Lureau --- monitor.c | 23 ++++++----------------- qapi/qmp-dispatch.c | 5 +++++ tests/test-qmp-cmds.c | 17 +++++++++++++++++ 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/monitor.c b/monitor.c index 471c57e88c..ddcc3a5748 100644 --- a/monitor.c +++ b/monitor.c @@ -3899,16 +3899,9 @@ static int monitor_can_read(void *opaque) return !atomic_mb_read(&mon->suspend_cnt); } =20 -/* take the ownership of rsp & id */ -static void monitor_qmp_respond(Monitor *mon, QDict *rsp, QObject *id) +/* take the ownership of rsp */ +static void monitor_qmp_respond(Monitor *mon, QDict *rsp) { - if (!rsp) { - return; - } - - if (id) { - qdict_put_obj(rsp, "id", id); - } if (mon->qmp.commands =3D=3D &qmp_cap_negotiation_commands) { QDict *qdict =3D qdict_get_qdict(rsp, "error"); if (qdict @@ -3941,11 +3934,9 @@ static void monitor_qmp_dispatch_one(QMPRequest *req= _obj) { Monitor *mon, *old_mon; QDict *req, *rsp =3D NULL; - QObject *id; =20 req =3D req_obj->req; mon =3D req_obj->mon; - id =3D req_obj->id; =20 g_free(req_obj); =20 @@ -3963,7 +3954,9 @@ static void monitor_qmp_dispatch_one(QMPRequest *req_= obj) cur_mon =3D old_mon; =20 /* Respond if necessary */ - monitor_qmp_respond(mon, rsp, id); + if (rsp) { + monitor_qmp_respond(mon, rsp); + } =20 =20 QDECREF(req); @@ -4060,9 +4053,6 @@ static void handle_qmp_command(JSONMessageParser *par= ser, GQueue *tokens) goto err; } =20 - qobject_incref(id); - qdict_del(qdict, "id"); - req_obj =3D g_new0(QMPRequest, 1); req_obj->mon =3D mon; req_obj->id =3D id; @@ -4094,7 +4084,6 @@ static void handle_qmp_command(JSONMessageParser *par= ser, GQueue *tokens) qapi_event_send_command_dropped(id, COMMAND_DROP_REASON_QUEUE_FULL, &error_abort); - qobject_decref(id); qobject_decref(req); g_free(req_obj); return; @@ -4117,7 +4106,7 @@ err: qdict =3D qdict_new(); qdict_put_obj(qdict, "error", qmp_build_error_object(err)); error_free(err); - monitor_qmp_respond(mon, qdict, id); + monitor_qmp_respond(mon, qdict); qobject_decref(req); } =20 diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 66596b66a0..4be0648809 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -151,10 +151,15 @@ QDict *qmp_dispatch(QmpCommandList *cmds, QDict *req) Error *err =3D NULL; QObject *ret; QDict *rsp; + QObject *id =3D qdict_get(req, "id"); =20 ret =3D do_qmp_dispatch(cmds, req, &err); =20 rsp =3D qdict_new(); + if (id) { + qobject_incref(id); + qdict_put_obj(rsp, "id", id); + } if (err) { qdict_put_obj(rsp, "error", qmp_build_error_object(err)); error_free(err); diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c index 52e2738a93..58d948b01f 100644 --- a/tests/test-qmp-cmds.c +++ b/tests/test-qmp-cmds.c @@ -277,6 +277,22 @@ static void test_dealloc_partial(void) qapi_free_UserDefTwo(ud2); } =20 +static void test_dispatch_cmd_id(void) +{ + QDict *resp, *req =3D qdict_new(); + + qdict_put_str(req, "execute", "user_def_cmd"); + qdict_put_str(req, "id", "ID42"); + + resp =3D qmp_dispatch(&qmp_commands, req); + assert(resp !=3D NULL); + assert(!qdict_haskey(resp, "error")); + assert(!strcmp(qdict_get_str(resp, "id"), "ID42")); + + QDECREF(resp); + QDECREF(req); +} + =20 int main(int argc, char **argv) { @@ -287,6 +303,7 @@ int main(int argc, char **argv) g_test_add_func("/qmp/dispatch_cmd_io", test_dispatch_cmd_io); g_test_add_func("/qmp/dispatch_cmd_success_response", test_dispatch_cmd_success_response); + g_test_add_func("/qmp/dispatch_cmd_id", test_dispatch_cmd_id); g_test_add_func("/qmp/dealloc_types", test_dealloc_types); g_test_add_func("/qmp/dealloc_partial", test_dealloc_partial); =20 --=20 2.17.0.rc1.1.g4c4f2b46a3