[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/24] qobject: Propagate parse errors through qobje
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 08/24] qobject: Propagate parse errors through qobject_from_jsonv() |
Date: |
Mon, 27 Feb 2017 12:20:34 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
include/qapi/qmp/qjson.h | 3 ++-
qobject/qjson.c | 12 ++++++++----
tests/libqtest.c | 2 +-
tests/test-qobject-input-visitor.c | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h
index 02b1f2c..6fe42d0 100644
--- a/include/qapi/qmp/qjson.h
+++ b/include/qapi/qmp/qjson.h
@@ -19,7 +19,8 @@
QObject *qobject_from_json(const char *string);
QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2);
-QObject *qobject_from_jsonv(const char *string, va_list *ap) GCC_FMT_ATTR(1,
0);
+QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp)
+ GCC_FMT_ATTR(1, 0);
QString *qobject_to_json(const QObject *obj);
QString *qobject_to_json_pretty(const QObject *obj);
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 9a0de89..339c9f7 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -12,6 +12,7 @@
*/
#include "qemu/osdep.h"
+#include "qapi/error.h"
#include "qapi/qmp/json-lexer.h"
#include "qapi/qmp/json-parser.h"
#include "qapi/qmp/json-streamer.h"
@@ -24,15 +25,17 @@ typedef struct JSONParsingState
JSONMessageParser parser;
va_list *ap;
QObject *result;
+ Error *err;
} JSONParsingState;
static void parse_json(JSONMessageParser *parser, GQueue *tokens)
{
JSONParsingState *s = container_of(parser, JSONParsingState, parser);
- s->result = json_parser_parse(tokens, s->ap);
+
+ s->result = json_parser_parse_err(tokens, s->ap, &s->err);
}
-QObject *qobject_from_jsonv(const char *string, va_list *ap)
+QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp)
{
JSONParsingState state = {};
@@ -43,12 +46,13 @@ QObject *qobject_from_jsonv(const char *string, va_list *ap)
json_message_parser_flush(&state.parser);
json_message_parser_destroy(&state.parser);
+ error_propagate(errp, state.err);
return state.result;
}
QObject *qobject_from_json(const char *string)
{
- return qobject_from_jsonv(string, NULL);
+ return qobject_from_jsonv(string, NULL, NULL);
}
/*
@@ -61,7 +65,7 @@ QObject *qobject_from_jsonf(const char *string, ...)
va_list ap;
va_start(ap, string);
- obj = qobject_from_jsonv(string, &ap);
+ obj = qobject_from_jsonv(string, &ap, NULL);
va_end(ap);
assert(obj != NULL);
diff --git a/tests/libqtest.c b/tests/libqtest.c
index cf27afc..683d5e3 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -442,7 +442,7 @@ void qmp_fd_sendv(int fd, const char *fmt, va_list ap)
* is an array type.
*/
va_copy(ap_copy, ap);
- qobj = qobject_from_jsonv(fmt, &ap_copy);
+ qobj = qobject_from_jsonv(fmt, &ap_copy, NULL);
va_end(ap_copy);
/* No need to send anything for an empty QObject. */
diff --git a/tests/test-qobject-input-visitor.c
b/tests/test-qobject-input-visitor.c
index 650637e..44885ee 100644
--- a/tests/test-qobject-input-visitor.c
+++ b/tests/test-qobject-input-visitor.c
@@ -51,7 +51,7 @@ static Visitor
*visitor_input_test_init_internal(TestInputVisitorData *data,
{
visitor_input_teardown(data, NULL);
- data->obj = qobject_from_jsonv(json_string, ap);
+ data->obj = qobject_from_jsonv(json_string, ap, NULL);
g_assert(data->obj);
if (keyval) {
--
2.7.4
- [Qemu-devel] [PATCH 21/24] test-qapi-util: New, covering qapi/qapi-util.c, (continued)
- [Qemu-devel] [PATCH 21/24] test-qapi-util: New, covering qapi/qapi-util.c, Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 18/24] block: Initial implementation of -blockdev, Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 17/24] qapi: New qobject_input_visitor_new_str() for convenience, Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 02/24] tests: Fix gcov-files-test-qemu-opts-y, gcov-files-test-logging-y, Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 08/24] qobject: Propagate parse errors through qobject_from_jsonv(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 07/24] qapi: Factor out common qobject_input_get_keyval(), Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 23/24] keyval: Restrict key components to valid QAPI names, Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 19/24] qapi: Improve how keyval input visitor reports unexpected dicts, Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 06/24] qapi: Factor out common part of qobject input visitor creation, Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 22/24] qapi: New parse_qapi_name(), Markus Armbruster, 2017/02/27