From patchwork Mon Mar 26 15:09:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 10308101 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 37F5A600F6 for ; Mon, 26 Mar 2018 15:26:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27712294BB for ; Mon, 26 Mar 2018 15:26:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C14229513; Mon, 26 Mar 2018 15:26:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8CCA8294BB for ; Mon, 26 Mar 2018 15:26:49 +0000 (UTC) Received: from localhost ([::1]:57368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0U1I-0004AO-Q4 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 26 Mar 2018 11:26:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0TlN-0005sf-P5 for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:10:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0TlH-00034y-RB for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:10:21 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52760 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 1f0TlH-00034V-Kt for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:10:15 -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 4B5798182D38; Mon, 26 Mar 2018 15:10:15 +0000 (UTC) Received: from localhost (ovpn-112-61.ams2.redhat.com [10.36.112.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3F2421A4699; Mon, 26 Mar 2018 15:10:14 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2018 17:09:00 +0200 Message-Id: <20180326150916.9602-23-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.4 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:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 26 Mar 2018 15:10:15 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'marcandre.lureau@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 v3 22/38] monitor: use QmpSession parsing and common dispatch code 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The previous patch allow to factorize some code out of monitor, and reuse the JSON parsing in QmpSession. Signed-off-by: Marc-André Lureau --- monitor.c | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/monitor.c b/monitor.c index ae8c055df0..94ad366c2d 100644 --- a/monitor.c +++ b/monitor.c @@ -58,8 +58,6 @@ #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/json-streamer.h" -#include "qapi/qmp/json-parser.h" #include "qapi/qmp/qlist.h" #include "qom/object_interfaces.h" #include "trace-root.h" @@ -625,7 +623,6 @@ static void monitor_data_destroy(Monitor *mon) qemu_chr_fe_deinit(&mon->chr, false); if (monitor_is_qmp(mon)) { qmp_session_destroy(&mon->qmp.session); - json_message_parser_destroy(&mon->qmp.parser); } readline_free(mon->rs); QDECREF(mon->outbuf); @@ -4011,32 +4008,20 @@ static void monitor_qmp_bh_dispatcher(void *data) #define QMP_REQ_QUEUE_LEN_MAX (8) -static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) +static void qmp_dispatch_cb(QmpSession *session, QDict *req) { - QObject *req, *id = NULL; - QDict *qdict = NULL; - MonitorQMP *mon_qmp = container_of(parser, MonitorQMP, parser); - Monitor *mon = container_of(mon_qmp, Monitor, qmp); + QDict *rsp; + QObject *id; + Monitor *mon = container_of(session, Monitor, qmp.session); Error *err = NULL; QMPRequest *req_obj; - req = json_parser_parse_err(tokens, NULL, &err); - if (err) { - goto err; - } - - /* Check against the request in general layout */ - qdict = qmp_dispatch_check_obj(req, &err); - if (!qdict) { - goto err; - } - /* Check against OOB specific */ - if (!qmp_cmd_oob_check(mon, qdict, &err)) { + if (!qmp_cmd_oob_check(mon, req, &err)) { goto err; } - id = qdict_get(qdict, "id"); + id = qdict_get(req, "id"); /* When OOB is enabled, the "id" field is mandatory. */ if (qmp_oob_enabled(mon) && !id) { @@ -4045,12 +4030,13 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) goto err; } + QINCREF(req); req_obj = g_new0(QMPRequest, 1); req_obj->mon = mon; req_obj->id = id; - req_obj->req = qdict; + req_obj->req = req; - if (qmp_is_oob(qdict)) { + if (qmp_is_oob(req)) { /* Out-Of-Band (OOB) requests are executed directly in parser. */ trace_monitor_qmp_cmd_out_of_band(qobject_get_try_str(req_obj->id) ?: ""); @@ -4076,7 +4062,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) qapi_event_send_command_dropped(id, COMMAND_DROP_REASON_QUEUE_FULL, &error_abort); - qobject_decref(req); + QDECREF(req); g_free(req_obj); return; } @@ -4095,19 +4081,18 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) return; err: - qdict = qdict_new(); - qdict_put_obj(qdict, "error", qmp_build_error_object(err)); + rsp = qdict_new(); + qdict_put_obj(rsp, "error", qmp_build_error_object(err)); error_free(err); - monitor_json_emitter(mon, QOBJECT(qdict)); - QDECREF(qdict); - qobject_decref(req); + monitor_json_emitter(mon, QOBJECT(rsp)); + QDECREF(rsp); } static void monitor_qmp_read(void *opaque, const uint8_t *buf, int size) { Monitor *mon = opaque; - json_message_parser_feed(&mon->qmp.parser, (const char *) buf, size); + qmp_session_feed(&mon->qmp.session, (const char *) buf, size); } static void monitor_read(void *opaque, const uint8_t *buf, int size) @@ -4217,7 +4202,7 @@ static void monitor_qmp_event(void *opaque, int event) case CHR_EVENT_OPENED: qmp_session_init(&mon->qmp.session, &qmp_cap_negotiation_commands, - NULL, /* XXX: not in use yet, but in following patch */ + qmp_dispatch_cb, dispatch_return_cb); monitor_qmp_caps_reset(mon); data = get_qmp_greeting(mon); @@ -4227,8 +4212,6 @@ static void monitor_qmp_event(void *opaque, int event) break; case CHR_EVENT_CLOSED: qmp_session_destroy(&mon->qmp.session); - json_message_parser_destroy(&mon->qmp.parser); - json_message_parser_init(&mon->qmp.parser, handle_qmp_command); mon_refcount--; monitor_fdsets_cleanup(); break; @@ -4429,7 +4412,6 @@ void monitor_init(Chardev *chr, int flags) if (monitor_is_qmp(mon)) { qemu_chr_fe_set_echo(&mon->chr, true); - json_message_parser_init(&mon->qmp.parser, handle_qmp_command); if (mon->use_io_thr) { /* * Make sure the old iowatch is gone. It's possible when