| Message ID | 1399572762-13990-4-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 05/08/2014 12:12 PM, Max Reitz wrote: > If the filename given to bdrv_open() is prefixed with "json:", parse the > rest as a JSON object and merge the result into the options QDict. If > there are conflicts, report one of them to the user and abort. Commit message is stale compared to change in the code. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > block.c | 41 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 41 insertions(+) Code is find, though, so: Reviewed-by: Eric Blake <eblake@redhat.com> > + > + /* Options given in the filename have lower priority than options > + * specified directly */ > + qdict_join(options, json_options, false); > + QDECREF(json_options); > + filename = NULL; > + } > + > bs->options = options; > options = qdict_clone_shallow(options); > >
Am 14.05.2014 um 00:12 hat Eric Blake geschrieben: > On 05/08/2014 12:12 PM, Max Reitz wrote: > > If the filename given to bdrv_open() is prefixed with "json:", parse the > > rest as a JSON object and merge the result into the options QDict. If > > there are conflicts, report one of them to the user and abort. > > Commit message is stale compared to change in the code. Changed the last sentence as follows: "If there are conflicts, the options QDict takes precedence." Kevin
diff --git a/block.c b/block.c index b749d31..6ac0f84 100644 --- a/block.c +++ b/block.c @@ -1275,6 +1275,33 @@ out: g_free(tmp_filename); } +static QDict *parse_json_filename(const char *filename, Error **errp) +{ + QObject *options_obj; + QDict *options; + int ret; + + ret = strstart(filename, "json:", &filename); + assert(ret); + + options_obj = qobject_from_json(filename); + if (!options_obj) { + error_setg(errp, "Could not parse the JSON options"); + return NULL; + } + + if (qobject_type(options_obj) != QTYPE_QDICT) { + qobject_decref(options_obj); + error_setg(errp, "Invalid JSON object given"); + return NULL; + } + + options = qobject_to_qdict(options_obj); + qdict_flatten(options); + + return options; +} + /* * Opens a disk image (raw, qcow2, vmdk, ...) * @@ -1337,6 +1364,20 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, options = qdict_new(); } + if (filename && g_str_has_prefix(filename, "json:")) { + QDict *json_options = parse_json_filename(filename, &local_err); + if (local_err) { + ret = -EINVAL; + goto fail; + } + + /* Options given in the filename have lower priority than options + * specified directly */ + qdict_join(options, json_options, false); + QDECREF(json_options); + filename = NULL; + } + bs->options = options; options = qdict_clone_shallow(options);
If the filename given to bdrv_open() is prefixed with "json:", parse the rest as a JSON object and merge the result into the options QDict. If there are conflicts, report one of them to the user and abort. Signed-off-by: Max Reitz <mreitz@redhat.com> --- block.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)