[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/24] block: More detailed syntax error reporting f
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 13/24] block: More detailed syntax error reporting for JSON filenames |
Date: |
Mon, 27 Feb 2017 12:20:39 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
block.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index aa6790c..de7d530 100644
--- a/block.c
+++ b/block.c
@@ -1163,9 +1163,14 @@ static QDict *parse_json_filename(const char *filename,
Error **errp)
ret = strstart(filename, "json:", &filename);
assert(ret);
- options_obj = qobject_from_json(filename, NULL);
+ options_obj = qobject_from_json(filename, errp);
if (!options_obj) {
- error_setg(errp, "Could not parse the JSON options");
+ /* Work around qobject_from_json() lossage TODO fix that */
+ if (errp && !*errp) {
+ error_setg(errp, "Could not parse the JSON options");
+ return NULL;
+ }
+ error_prepend(errp, "Could not parse the JSON options: ");
return NULL;
}
--
2.7.4
- [Qemu-devel] [PATCH 16/24] monitor: Assert qmp_schema_json[] is sane, (continued)
- [Qemu-devel] [PATCH 16/24] monitor: Assert qmp_schema_json[] is sane, Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 15/24] test-visitor-serialization: Pass &error_abort to qobject_from_json(), Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 12/24] qobject: Propagate parse errors through qobject_from_json(), Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 20/24] docs/qapi-code-gen.txt: Clarify naming rules, Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 13/24] block: More detailed syntax error reporting for JSON filenames,
Markus Armbruster <=
- [Qemu-devel] [PATCH 05/24] test-keyval: Cover use with qobject input visitor, Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 14/24] check-qjson: Test errors from qobject_from_json(), Markus Armbruster, 2017/02/27
- [Qemu-devel] [PATCH 09/24] libqtest: Fix qmp() & friends to abort on JSON parse errors, Markus Armbruster, 2017/02/27