[Qemu-devel] [PATCH v2 07/18] qmp: drop json_parser_parse() wrapper

[Marc-André Lureau]

Stupid wrapper that's used exactly once, in libqtest.c.  Let's use
json_parser_parse_err() there, and drop the wrapper.  Let's rename
json_parser_parse_err() to json_parser_parse() then.

Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
 include/qapi/qmp/json-parser.h | 3 +--
 monitor.c                      | 4 ++--
 qga/main.c                     | 2 +-
 qobject/json-parser.c          | 7 +------
 qobject/qjson.c                | 2 +-
 tests/libqtest.c               | 2 +-
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/include/qapi/qmp/json-parser.h b/include/qapi/qmp/json-parser.h
index 102f5c0068..a34209db7a 100644
--- a/include/qapi/qmp/json-parser.h
+++ b/include/qapi/qmp/json-parser.h
@@ -16,7 +16,6 @@
 
 #include "qemu-common.h"
 
-QObject *json_parser_parse(GQueue *tokens, va_list *ap);
-QObject *json_parser_parse_err(GQueue *tokens, va_list *ap, Error **errp);
+QObject *json_parser_parse(GQueue *tokens, va_list *ap, Error **errp);
 
 #endif
diff --git a/monitor.c b/monitor.c
index 961779032a..2abb3c2fc7 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4113,9 +4113,9 @@ static void handle_qmp_command(JSONMessageParser *parser, 
GQueue *tokens)
     Error *err = NULL;
     QMPRequest *req_obj;
 
-    req = json_parser_parse_err(tokens, NULL, &err);
+    req = json_parser_parse(tokens, NULL, &err);
     if (!req && !err) {
-        /* json_parser_parse_err() sucks: can fail without setting @err */
+        /* json_parser_parse() sucks: can fail without setting @err */
         error_setg(&err, QERR_JSON_PARSING);
     }
 
diff --git a/qga/main.c b/qga/main.c
index 87372d40ef..043f7c3ead 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -608,7 +608,7 @@ static void process_event(JSONMessageParser *parser, GQueue 
*tokens)
     g_assert(s && parser);
 
     g_debug("process_event: called");
-    obj = json_parser_parse_err(tokens, NULL, &err);
+    obj = json_parser_parse(tokens, NULL, &err);
     if (err) {
         goto err;
     }
diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index a5aa790d62..9a7004e680 100644
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -575,12 +575,7 @@ static QObject *parse_value(JSONParserContext *ctxt, 
va_list *ap)
     }
 }
 
-QObject *json_parser_parse(GQueue *tokens, va_list *ap)
-{
-    return json_parser_parse_err(tokens, ap, NULL);
-}
-
-QObject *json_parser_parse_err(GQueue *tokens, va_list *ap, Error **errp)
+QObject *json_parser_parse(GQueue *tokens, va_list *ap, Error **errp)
 {
     JSONParserContext *ctxt = parser_context_new(tokens);
     QObject *result;
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 2f6a590e44..ee04e61096 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -36,7 +36,7 @@ static void parse_json(JSONMessageParser *parser, GQueue 
*tokens)
 {
     JSONParsingState *s = container_of(parser, JSONParsingState, parser);
 
-    s->result = json_parser_parse_err(tokens, s->ap, &s->err);
+    s->result = json_parser_parse(tokens, s->ap, &s->err);
 }
 
 QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 098af6aec4..3826b8baf3 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -432,7 +432,7 @@ static void qmp_response(JSONMessageParser *parser, GQueue 
*tokens)
     QMPResponseParser *qmp = container_of(parser, QMPResponseParser, parser);
     QObject *obj;
 
-    obj = json_parser_parse(tokens, NULL);
+    obj = json_parser_parse(tokens, NULL, NULL);
     if (!obj) {
         fprintf(stderr, "QMP JSON response parsing failed\n");
         exit(1);
-- 
2.18.0.129.ge3331758f1