From 765003db029ed4660a09807958276e251de84fac Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 3 Feb 2014 14:49:42 +0100 Subject: block: Fail gracefully with missing filename This fixes a regression introduced in commit 2a05cbe42 ('block: Allow block devices without files'): $ qemu-system-x86_64 -drive driver=file qemu-system-x86_64: block.c:892: bdrv_open_common: Assertion `!drv->bdrv_needs_filename || filename != ((void *)0)' failed. Now the respective check must be performed not only in bdrv_file_open(), but also in bdrv_open(). Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- block.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'block.c') diff --git a/block.c b/block.c index cb21a5fa61..ac0ccac76d 100644 --- a/block.c +++ b/block.c @@ -832,6 +832,12 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, filename = qdict_get_try_str(options, "filename"); } + if (drv->bdrv_needs_filename && !filename) { + error_setg(errp, "The '%s' block driver requires a file name", + drv->format_name); + return -EINVAL; + } + trace_bdrv_open_common(bs, filename ?: "", flags, drv->format_name); node_name = qdict_get_try_str(options, "node-name"); @@ -1031,11 +1037,6 @@ int bdrv_file_open(BlockDriverState **pbs, const char *filename, goto fail; } qdict_del(options, "filename"); - } else if (drv->bdrv_needs_filename && !filename) { - error_setg(errp, "The '%s' block driver requires a file name", - drv->format_name); - ret = -EINVAL; - goto fail; } if (!drv->bdrv_file_open) { -- cgit v1.2.1