From 2af5ef70af9fdc823407ddc4ae14766806d4837a Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 9 Apr 2013 13:19:18 +0200 Subject: block: Fail gracefully when using a format driver on protocol level Specifying the wrong driver could fail an assertion: $ qemu-system-x86_64 -drive file.driver=qcow2,file=x qemu-system-x86_64: block.c:721: bdrv_open_common: Assertion `file != ((void *)0)' failed. Signed-off-by: Kevin Wolf --- block.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'block.c') diff --git a/block.c b/block.c index 4ad663d3fa..bea47c4755 100644 --- a/block.c +++ b/block.c @@ -718,6 +718,13 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, assert(drv->bdrv_parse_filename || filename != NULL); ret = drv->bdrv_file_open(bs, filename, options, open_flags); } else { + if (file == NULL) { + qerror_report(ERROR_CLASS_GENERIC_ERROR, "Can't use '%s' as a " + "block driver for the protocol level", + drv->format_name); + ret = -EINVAL; + goto free_and_fail; + } assert(file != NULL); bs->file = file; ret = drv->bdrv_open(bs, options, open_flags); -- cgit v1.2.1