From patchwork Thu Sep 14 07:50:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 813727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xt9mP16pbz9sRm for ; Thu, 14 Sep 2017 17:54:45 +1000 (AEST) Received: from localhost ([::1]:46195 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsOyx-0000xS-7s for incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 03:54:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsOvk-0006T0-FV for qemu-devel@nongnu.org; Thu, 14 Sep 2017 03:51:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsOvh-0006tQ-Ar for qemu-devel@nongnu.org; Thu, 14 Sep 2017 03:51:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29950) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsOvh-0006sh-0x for qemu-devel@nongnu.org; Thu, 14 Sep 2017 03:51:21 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0A3E1356D6; Thu, 14 Sep 2017 07:51:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0A3E1356D6 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=peterx@redhat.com Received: from pxdev.xzpeter.org.com (dhcp-15-224.nay.redhat.com [10.66.15.224]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2487C756A4; Thu, 14 Sep 2017 07:51:15 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Thu, 14 Sep 2017 15:50:26 +0800 Message-Id: <1505375436-28439-6-git-send-email-peterx@redhat.com> In-Reply-To: <1505375436-28439-1-git-send-email-peterx@redhat.com> References: <1505375436-28439-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 14 Sep 2017 07:51:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC 05/15] qjson: add "opaque" field to JSONMessageParser 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: Laurent Vivier , Fam Zheng , Juan Quintela , Markus Armbruster , peterx@redhat.com, mdroth@linux.vnet.ibm.com, Stefan Hajnoczi , =?utf-8?q?Marc-Andr=C3=A9_Lure?= =?utf-8?q?au?= , Paolo Bonzini , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It'll be passed to emit() as well when it happens. Signed-off-by: Peter Xu --- include/qapi/qmp/json-streamer.h | 8 ++++++-- monitor.c | 7 ++++--- qga/main.c | 5 +++-- qobject/json-streamer.c | 7 +++++-- qobject/qjson.c | 5 +++-- tests/libqtest.c | 5 +++-- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/include/qapi/qmp/json-streamer.h b/include/qapi/qmp/json-streamer.h index 00d8a23..b83270c 100644 --- a/include/qapi/qmp/json-streamer.h +++ b/include/qapi/qmp/json-streamer.h @@ -25,16 +25,20 @@ typedef struct JSONToken { typedef struct JSONMessageParser { - void (*emit)(struct JSONMessageParser *parser, GQueue *tokens); + void (*emit)(struct JSONMessageParser *parser, GQueue *tokens, void *opaque); JSONLexer lexer; int brace_count; int bracket_count; GQueue *tokens; uint64_t token_size; + /* To be passed in when emit(). */ + void *opaque; } JSONMessageParser; void json_message_parser_init(JSONMessageParser *parser, - void (*func)(JSONMessageParser *, GQueue *)); + void (*func)(JSONMessageParser *, GQueue *, + void *opaque), + void *opaque); int json_message_parser_feed(JSONMessageParser *parser, const char *buffer, size_t size); diff --git a/monitor.c b/monitor.c index 8b32519..9096b64 100644 --- a/monitor.c +++ b/monitor.c @@ -3817,7 +3817,8 @@ static int monitor_can_read(void *opaque) return (mon->suspend_cnt == 0) ? 1 : 0; } -static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) +static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens, + void *opaque) { QObject *req, *rsp = NULL, *id = NULL; QDict *qdict = NULL; @@ -3964,7 +3965,7 @@ static void monitor_qmp_event(void *opaque, int event) break; case CHR_EVENT_CLOSED: json_message_parser_destroy(&mon->qmp.parser); - json_message_parser_init(&mon->qmp.parser, handle_qmp_command); + json_message_parser_init(&mon->qmp.parser, handle_qmp_command, NULL); mon_refcount--; monitor_fdsets_cleanup(); break; @@ -4114,7 +4115,7 @@ void monitor_init(Chardev *chr, int flags) qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, NULL, mon, NULL, true); qemu_chr_fe_set_echo(&mon->chr, true); - json_message_parser_init(&mon->qmp.parser, handle_qmp_command); + json_message_parser_init(&mon->qmp.parser, handle_qmp_command, NULL); } else { qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_read, monitor_event, NULL, mon, NULL, true); diff --git a/qga/main.c b/qga/main.c index 62a6275..3b5ebbc 100644 --- a/qga/main.c +++ b/qga/main.c @@ -593,7 +593,8 @@ static void process_command(GAState *s, QDict *req) } /* handle requests/control events coming in over the channel */ -static void process_event(JSONMessageParser *parser, GQueue *tokens) +static void process_event(JSONMessageParser *parser, GQueue *tokens, + void *opaque) { GAState *s = container_of(parser, GAState, parser); QDict *qdict; @@ -1320,7 +1321,7 @@ static int run_agent(GAState *s, GAConfig *config, int socket_activation) s->command_state = ga_command_state_new(); ga_command_state_init(s, s->command_state); ga_command_state_init_all(s->command_state); - json_message_parser_init(&s->parser, process_event); + json_message_parser_init(&s->parser, process_event, NULL); #ifndef _WIN32 if (!register_signal_handlers()) { diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c index c51c202..12865d5 100644 --- a/qobject/json-streamer.c +++ b/qobject/json-streamer.c @@ -102,18 +102,21 @@ out_emit: */ tokens = parser->tokens; parser->tokens = g_queue_new(); - parser->emit(parser, tokens); + parser->emit(parser, tokens, parser->opaque); parser->token_size = 0; } void json_message_parser_init(JSONMessageParser *parser, - void (*func)(JSONMessageParser *, GQueue *)) + void (*func)(JSONMessageParser *, + GQueue *, void *opaque), + void *opaque) { parser->emit = func; parser->brace_count = 0; parser->bracket_count = 0; parser->tokens = g_queue_new(); parser->token_size = 0; + parser->opaque = opaque; json_lexer_init(&parser->lexer, json_message_process_token); } diff --git a/qobject/qjson.c b/qobject/qjson.c index 2e09308..f9766fe 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -28,7 +28,8 @@ typedef struct JSONParsingState Error *err; } JSONParsingState; -static void parse_json(JSONMessageParser *parser, GQueue *tokens) +static void parse_json(JSONMessageParser *parser, GQueue *tokens, + void *opaque) { JSONParsingState *s = container_of(parser, JSONParsingState, parser); @@ -41,7 +42,7 @@ QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp) state.ap = ap; - json_message_parser_init(&state.parser, parse_json); + json_message_parser_init(&state.parser, parse_json, NULL); json_message_parser_feed(&state.parser, string, strlen(string)); json_message_parser_flush(&state.parser); json_message_parser_destroy(&state.parser); diff --git a/tests/libqtest.c b/tests/libqtest.c index 0c12b38..fbd8e12 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -387,7 +387,8 @@ typedef struct { QDict *response; } QMPResponseParser; -static void qmp_response(JSONMessageParser *parser, GQueue *tokens) +static void qmp_response(JSONMessageParser *parser, GQueue *tokens, + void *opaque) { QMPResponseParser *qmp = container_of(parser, QMPResponseParser, parser); QObject *obj; @@ -409,7 +410,7 @@ QDict *qmp_fd_receive(int fd) bool log = getenv("QTEST_LOG") != NULL; qmp.response = NULL; - json_message_parser_init(&qmp.parser, qmp_response); + json_message_parser_init(&qmp.parser, qmp_response, NULL); while (!qmp.response) { ssize_t len; char c;