[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 13/24] block: More detailed syntax error reporting
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 13/24] block: More detailed syntax error reporting for JSON filenames |
Date: |
Mon, 6 Mar 2017 15:11:44 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-Id: <address@hidden>
---
block.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 5ef5c7c..fe7bddb 100644
--- a/block.c
+++ b/block.c
@@ -1262,9 +1262,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] [PULL v2 00/24] block: Command line option -blockdev, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 01/24] test-qemu-opts: Cover qemu_opts_parse() of "no", Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 16/24] monitor: Assert qmp_schema_json[] is sane, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 13/24] block: More detailed syntax error reporting for JSON filenames,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 08/24] qobject: Propagate parse errors through qobject_from_jsonv(), Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 06/24] qapi: Factor out common part of qobject input visitor creation, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 18/24] qapi: New parse_qapi_name(), Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 19/24] keyval: Restrict key components to valid QAPI names, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 10/24] qjson: Abort earlier on qobject_from_jsonf() misuse, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 09/24] libqtest: Fix qmp() & friends to abort on JSON parse errors, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 15/24] test-visitor-serialization: Pass &error_abort to qobject_from_json(), Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 12/24] qobject: Propagate parse errors through qobject_from_json(), Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 11/24] test-qobject-input-visitor: Abort earlier on bad test input, Markus Armbruster, 2017/03/06
- [Qemu-devel] [PULL v2 22/24] qapi: Improve how keyval input visitor reports unexpected dicts, Markus Armbruster, 2017/03/06