From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzoJD-0003ds-Dh for qemu-devel@nongnu.org; Wed, 25 Jun 2014 10:36:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzoJ5-0002U2-SC for qemu-devel@nongnu.org; Wed, 25 Jun 2014 10:36:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzoJ5-0002Tr-Jn for qemu-devel@nongnu.org; Wed, 25 Jun 2014 10:36:15 -0400 From: Kevin Wolf Date: Wed, 25 Jun 2014 16:35:52 +0200 Message-Id: <1403706959-6979-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1403706959-6979-1-git-send-email-kwolf@redhat.com> References: <1403706959-6979-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/9] block: Move bdrv_fill_options() call to bdrv_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit.canet@irqsave.net, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com bs->options now contains the modified version of the options. Signed-off-by: Kevin Wolf --- block.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index f1c3b57..b1087e6 100644 --- a/block.c +++ b/block.c @@ -1009,14 +1009,19 @@ free_and_fail: * 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, +static int bdrv_fill_options(QDict **options, const char *filename, int flags, Error **errp) { const char *drvname; + bool protocol = flags & BDRV_O_PROTOCOL; bool parse_filename = false; Error *local_err = NULL; BlockDriver *drv; + if (!protocol) { + return 0; + } + /* Fetch the file name from the options QDict if necessary */ if (filename) { if (!qdict_haskey(*options, "filename")) { @@ -1081,20 +1086,15 @@ static int bdrv_fill_options(QDict **options, const char *filename, * returns. Then, the caller is responsible for freeing it. If it intends to * reuse the QDict, QINCREF() should be called beforehand. */ -static int bdrv_file_open(BlockDriverState *bs, const char *filename, - QDict **options, int flags, Error **errp) +static int bdrv_file_open(BlockDriverState *bs, QDict **options, int flags, + Error **errp) { BlockDriver *drv; + const char *filename; const char *drvname; Error *local_err = NULL; int ret; - ret = bdrv_fill_options(options, filename, &local_err); - if (local_err) { - error_propagate(errp, local_err); - goto fail; - } - filename = qdict_get_try_str(*options, "filename"); drvname = qdict_get_str(*options, "driver"); @@ -1436,12 +1436,17 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, filename = NULL; } + ret = bdrv_fill_options(&options, filename, flags, &local_err); + if (local_err) { + goto fail; + } + bs->options = options; options = qdict_clone_shallow(options); if (flags & BDRV_O_PROTOCOL) { assert(!drv); - ret = bdrv_file_open(bs, filename, &options, flags & ~BDRV_O_PROTOCOL, + ret = bdrv_file_open(bs, &options, flags & ~BDRV_O_PROTOCOL, &local_err); if (!ret) { drv = bs->drv; -- 1.8.3.1