Commit 5577fff7 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

block: More detailed syntax error reporting for JSON filenames 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-Id: <1488317230-26248-14-git-send-email-armbru@redhat.com>
parent 57348c2f

block.c

+7 −2
Original line number Diff line number Diff line
@@ -1262,11 +1262,16 @@ 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) {

        /* 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;

    }



    options = qobject_to_qdict(options_obj);

    if (!options) {