From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiSoZ-0004T7-Ob for qemu-devel@nongnu.org; Thu, 08 May 2014 14:13:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiSoT-0001x4-Go for qemu-devel@nongnu.org; Thu, 08 May 2014 14:13:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60394) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiSoT-0001wi-7c for qemu-devel@nongnu.org; Thu, 08 May 2014 14:12:57 -0400 From: Max Reitz Date: Thu, 8 May 2014 20:12:41 +0200 Message-Id: <1399572762-13990-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1399572762-13990-1-git-send-email-mreitz@redhat.com> References: <1399572762-13990-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 3/4] block: Allow JSON filenames List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , Max Reitz 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 --- block.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) 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); -- 1.9.2