From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3NdO-0007sG-8H for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W3NdI-0000sY-8X for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3NdI-0000sS-0U for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:36 -0500 From: Kevin Wolf Date: Wed, 15 Jan 2014 11:22:42 +0100 Message-Id: <1389781375-11774-30-git-send-email-kwolf@redhat.com> In-Reply-To: <1389781375-11774-1-git-send-email-kwolf@redhat.com> References: <1389781375-11774-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 29/42] block: Use bdrv_open_image() in bdrv_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Max Reitz Using bdrv_open_image() instead of bdrv_file_open() directly in bdrv_open() is easier. Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf --- block.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/block.c b/block.c index 76b6c25..9e4e85f 100644 --- a/block.c +++ b/block.c @@ -1128,8 +1128,6 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, /* TODO: extra byte is a hack to ensure MAX_PATH space on Windows. */ char tmp_filename[PATH_MAX + 1]; BlockDriverState *file = NULL; - QDict *file_options = NULL; - const char *file_reference; const char *drvname; Error *local_err = NULL; @@ -1215,17 +1213,11 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, flags |= BDRV_O_ALLOW_RDWR; } - qdict_extract_subqdict(options, &file_options, "file."); - file_reference = qdict_get_try_str(options, "file"); - - if (filename || file_reference || qdict_size(file_options)) { - ret = bdrv_file_open(&file, filename, file_reference, file_options, - bdrv_open_flags(bs, flags | BDRV_O_UNMAP), - &local_err); - qdict_del(options, "file"); - if (ret < 0) { - goto fail; - } + ret = bdrv_open_image(&file, filename, options, "file", + bdrv_open_flags(bs, flags | BDRV_O_UNMAP), true, true, + &local_err); + if (ret < 0) { + goto fail; } /* Find the right image format driver */ -- 1.8.1.4