From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wuj9d-0005Uf-FA for qemu-devel@nongnu.org; Wed, 11 Jun 2014 10:05:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wuj9W-0007MG-Rp for qemu-devel@nongnu.org; Wed, 11 Jun 2014 10:05:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wuj9W-0007MA-Jg for qemu-devel@nongnu.org; Wed, 11 Jun 2014 10:05:22 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5BE5MMr021993 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Jun 2014 10:05:22 -0400 From: Kevin Wolf Date: Wed, 11 Jun 2014 16:04:57 +0200 Message-Id: <1402495503-4722-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1402495503-4722-1-git-send-email-kwolf@redhat.com> References: <1402495503-4722-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 3/9] block: Move json: parsing to bdrv_fill_options() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, armbru@redhat.com, stefanha@redhat.com Signed-off-by: Kevin Wolf --- block.c | 88 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/block.c b/block.c index effb3e6..b9c2b41 100644 --- a/block.c +++ b/block.c @@ -1006,19 +1006,62 @@ free_and_fail: return ret; } +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; +} + /* * Fills in default options for opening images and converts the legacy * filename/flags pair to option QDict entries. */ -static int bdrv_fill_options(QDict **options, const char *filename, int flags, +static int bdrv_fill_options(QDict **options, const char **pfilename, int flags, Error **errp) { + const char *filename = *pfilename; const char *drvname; bool protocol = flags & BDRV_O_PROTOCOL; bool parse_filename = false; Error *local_err = NULL; BlockDriver *drv; + /* Parse json: pseudo-protocol */ + if (filename && g_str_has_prefix(filename, "json:")) { + QDict *json_options = parse_json_filename(filename, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } + + /* Options given in the filename have lower priority than options + * specified directly */ + qdict_join(*options, json_options, false); + QDECREF(json_options); + *pfilename = filename = NULL; + } + if (!protocol) { return 0; } @@ -1339,33 +1382,6 @@ 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, ...) * @@ -1429,21 +1445,7 @@ 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; - } - - ret = bdrv_fill_options(&options, filename, flags, &local_err); + ret = bdrv_fill_options(&options, &filename, flags, &local_err); if (local_err) { error_propagate(errp, local_err); return ret; -- 1.8.3.1