From 2258e3fe20990a13c9aa2c1adccafae073b7ce13 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Fri, 20 Dec 2013 19:28:09 +0100 Subject: [PATCH] block: Pass reference to bdrv_file_open() With that now being possible, bdrv_open() should try to extract a block device reference from the options and pass it to bdrv_file_open(). Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 1e53b3dffd..bef4f8232b 100644 --- a/block.c +++ b/block.c @@ -1056,6 +1056,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, char tmp_filename[PATH_MAX + 1]; BlockDriverState *file = NULL; QDict *file_options = NULL; + const char *file_reference; const char *drvname; Error *local_err = NULL; @@ -1142,9 +1143,11 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, } qdict_extract_subqdict(options, &file_options, "file."); + file_reference = qdict_get_try_str(options, "file"); - ret = bdrv_file_open(&file, filename, NULL, 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; } -- 2.11.4.GIT