{"id":813727,"url":"http://patchwork.ozlabs.org/api/patches/813727/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505375436-28439-6-git-send-email-peterx@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505375436-28439-6-git-send-email-peterx@redhat.com>","list_archive_url":null,"date":"2017-09-14T07:50:26","name":"[RFC,05/15] qjson: add \"opaque\" field to JSONMessageParser","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0824828a3aa93368e4be0f59e7bbbca92f9ff0b5","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/people/67717/?format=json","name":"Peter Xu","email":"peterx@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505375436-28439-6-git-send-email-peterx@redhat.com/mbox/","series":[{"id":3043,"url":"http://patchwork.ozlabs.org/api/series/3043/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3043","date":"2017-09-14T07:50:21","name":"QMP: out-of-band (OOB) execution support","version":1,"mbox":"http://patchwork.ozlabs.org/series/3043/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813727/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813727/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xt9mP16pbz9sRm\n\tfor ;\n\tThu, 14 Sep 2017 17:54:45 +1000 (AEST)","from localhost ([::1]:46195 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsOyx-0000xS-7s\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 03:54:43 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51933)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsOvk-0006T0-FV\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 03:51:25 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsOvh-0006tQ-Ar\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 03:51:24 -0400","from mx1.redhat.com ([209.132.183.28]:29950)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dsOvh-0006sh-0x\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 03:51:21 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0A3E1356D6;\n\tThu, 14 Sep 2017 07:51:20 +0000 (UTC)","from pxdev.xzpeter.org.com (dhcp-15-224.nay.redhat.com\n\t[10.66.15.224])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 2487C756A4;\n\tThu, 14 Sep 2017 07:51:15 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0A3E1356D6","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\n\t(mx1.redhat.com [10.5.110.30]);\n\tThu, 14 Sep 2017 07:51:20 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [RFC 05/15] qjson: add \"opaque\" field to\n\tJSONMessageParser","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Laurent Vivier , Fam Zheng , Juan\n\tQuintela , Markus Armbruster ,\n\tpeterx@redhat.com, mdroth@linux.vnet.ibm.com,\n\tStefan Hajnoczi , =?utf-8?q?Marc-Andr=C3=A9_Lure?=\n\t=?utf-8?q?au?= ,\n\tPaolo Bonzini , \"Dr . David Alan Gilbert\"\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"It'll be passed to emit() as well when it happens.\n\nSigned-off-by: Peter Xu \n---\n include/qapi/qmp/json-streamer.h | 8 ++++++--\n monitor.c | 7 ++++---\n qga/main.c | 5 +++--\n qobject/json-streamer.c | 7 +++++--\n qobject/qjson.c | 5 +++--\n tests/libqtest.c | 5 +++--\n 6 files changed, 24 insertions(+), 13 deletions(-)","diff":"diff --git a/include/qapi/qmp/json-streamer.h b/include/qapi/qmp/json-streamer.h\nindex 00d8a23..b83270c 100644\n--- a/include/qapi/qmp/json-streamer.h\n+++ b/include/qapi/qmp/json-streamer.h\n@@ -25,16 +25,20 @@ typedef struct JSONToken {\n \n typedef struct JSONMessageParser\n {\n- void (*emit)(struct JSONMessageParser *parser, GQueue *tokens);\n+ void (*emit)(struct JSONMessageParser *parser, GQueue *tokens, void *opaque);\n JSONLexer lexer;\n int brace_count;\n int bracket_count;\n GQueue *tokens;\n uint64_t token_size;\n+ /* To be passed in when emit(). */\n+ void *opaque;\n } JSONMessageParser;\n \n void json_message_parser_init(JSONMessageParser *parser,\n- void (*func)(JSONMessageParser *, GQueue *));\n+ void (*func)(JSONMessageParser *, GQueue *,\n+ void *opaque),\n+ void *opaque);\n \n int json_message_parser_feed(JSONMessageParser *parser,\n const char *buffer, size_t size);\ndiff --git a/monitor.c b/monitor.c\nindex 8b32519..9096b64 100644\n--- a/monitor.c\n+++ b/monitor.c\n@@ -3817,7 +3817,8 @@ static int monitor_can_read(void *opaque)\n return (mon->suspend_cnt == 0) ? 1 : 0;\n }\n \n-static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)\n+static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens,\n+ void *opaque)\n {\n QObject *req, *rsp = NULL, *id = NULL;\n QDict *qdict = NULL;\n@@ -3964,7 +3965,7 @@ static void monitor_qmp_event(void *opaque, int event)\n break;\n case CHR_EVENT_CLOSED:\n json_message_parser_destroy(&mon->qmp.parser);\n- json_message_parser_init(&mon->qmp.parser, handle_qmp_command);\n+ json_message_parser_init(&mon->qmp.parser, handle_qmp_command, NULL);\n mon_refcount--;\n monitor_fdsets_cleanup();\n break;\n@@ -4114,7 +4115,7 @@ void monitor_init(Chardev *chr, int flags)\n qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_qmp_read,\n monitor_qmp_event, NULL, mon, NULL, true);\n qemu_chr_fe_set_echo(&mon->chr, true);\n- json_message_parser_init(&mon->qmp.parser, handle_qmp_command);\n+ json_message_parser_init(&mon->qmp.parser, handle_qmp_command, NULL);\n } else {\n qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_read,\n monitor_event, NULL, mon, NULL, true);\ndiff --git a/qga/main.c b/qga/main.c\nindex 62a6275..3b5ebbc 100644\n--- a/qga/main.c\n+++ b/qga/main.c\n@@ -593,7 +593,8 @@ static void process_command(GAState *s, QDict *req)\n }\n \n /* handle requests/control events coming in over the channel */\n-static void process_event(JSONMessageParser *parser, GQueue *tokens)\n+static void process_event(JSONMessageParser *parser, GQueue *tokens,\n+ void *opaque)\n {\n GAState *s = container_of(parser, GAState, parser);\n QDict *qdict;\n@@ -1320,7 +1321,7 @@ static int run_agent(GAState *s, GAConfig *config, int socket_activation)\n s->command_state = ga_command_state_new();\n ga_command_state_init(s, s->command_state);\n ga_command_state_init_all(s->command_state);\n- json_message_parser_init(&s->parser, process_event);\n+ json_message_parser_init(&s->parser, process_event, NULL);\n \n #ifndef _WIN32\n if (!register_signal_handlers()) {\ndiff --git a/qobject/json-streamer.c b/qobject/json-streamer.c\nindex c51c202..12865d5 100644\n--- a/qobject/json-streamer.c\n+++ b/qobject/json-streamer.c\n@@ -102,18 +102,21 @@ out_emit:\n */\n tokens = parser->tokens;\n parser->tokens = g_queue_new();\n- parser->emit(parser, tokens);\n+ parser->emit(parser, tokens, parser->opaque);\n parser->token_size = 0;\n }\n \n void json_message_parser_init(JSONMessageParser *parser,\n- void (*func)(JSONMessageParser *, GQueue *))\n+ void (*func)(JSONMessageParser *,\n+ GQueue *, void *opaque),\n+ void *opaque)\n {\n parser->emit = func;\n parser->brace_count = 0;\n parser->bracket_count = 0;\n parser->tokens = g_queue_new();\n parser->token_size = 0;\n+ parser->opaque = opaque;\n \n json_lexer_init(&parser->lexer, json_message_process_token);\n }\ndiff --git a/qobject/qjson.c b/qobject/qjson.c\nindex 2e09308..f9766fe 100644\n--- a/qobject/qjson.c\n+++ b/qobject/qjson.c\n@@ -28,7 +28,8 @@ typedef struct JSONParsingState\n Error *err;\n } JSONParsingState;\n \n-static void parse_json(JSONMessageParser *parser, GQueue *tokens)\n+static void parse_json(JSONMessageParser *parser, GQueue *tokens,\n+ void *opaque)\n {\n JSONParsingState *s = container_of(parser, JSONParsingState, parser);\n \n@@ -41,7 +42,7 @@ QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp)\n \n state.ap = ap;\n \n- json_message_parser_init(&state.parser, parse_json);\n+ json_message_parser_init(&state.parser, parse_json, NULL);\n json_message_parser_feed(&state.parser, string, strlen(string));\n json_message_parser_flush(&state.parser);\n json_message_parser_destroy(&state.parser);\ndiff --git a/tests/libqtest.c b/tests/libqtest.c\nindex 0c12b38..fbd8e12 100644\n--- a/tests/libqtest.c\n+++ b/tests/libqtest.c\n@@ -387,7 +387,8 @@ typedef struct {\n QDict *response;\n } QMPResponseParser;\n \n-static void qmp_response(JSONMessageParser *parser, GQueue *tokens)\n+static void qmp_response(JSONMessageParser *parser, GQueue *tokens,\n+ void *opaque)\n {\n QMPResponseParser *qmp = container_of(parser, QMPResponseParser, parser);\n QObject *obj;\n@@ -409,7 +410,7 @@ QDict *qmp_fd_receive(int fd)\n bool log = getenv(\"QTEST_LOG\") != NULL;\n \n qmp.response = NULL;\n- json_message_parser_init(&qmp.parser, qmp_response);\n+ json_message_parser_init(&qmp.parser, qmp_response, NULL);\n while (!qmp.response) {\n ssize_t len;\n char c;\n","prefixes":["RFC","05/15"]}