david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: More detailed syntax error reporting for JSON filenames

Browse Source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <1488317230-26248-14-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2017-02-28 22:26:59 +01:00
parent 57348c2f18
commit 5577fff738
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block.c
View File

@ -1262,11 +1262,16 @@ static QDict *parse_json_filename(const char *filename, Error **errp)
ret = strstart(filename, "json:", &filename); ret = strstart(filename, "json:", &filename);
assert(ret); assert(ret);
options_obj = qobject_from_json(filename, NULL); options_obj = qobject_from_json(filename, errp);
if (!options_obj) { if (!options_obj) {
/* Work around qobject_from_json() lossage TODO fix that */
if (errp && !*errp) {
error_setg(errp, "Could not parse the JSON options"); error_setg(errp, "Could not parse the JSON options");
return NULL; return NULL;
} }
error_prepend(errp, "Could not parse the JSON options: ");
return NULL;
}
options = qobject_to_qdict(options_obj); options = qobject_to_qdict(options_obj);
if (!options) { if (!options) {