diff options
author | Kevin Wolf <kwolf@redhat.com> | 2013-04-09 13:19:18 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2013-04-22 10:27:59 +0200 |
commit | 2af5ef70af9fdc823407ddc4ae14766806d4837a (patch) | |
tree | fde91f9d44a54ea67cd13036d8cd2311dd2bd18f /block.c | |
parent | bdda92324dad963e85589e9ea74b2f2620319304 (diff) | |
download | hqemu-2af5ef70af9fdc823407ddc4ae14766806d4837a.zip hqemu-2af5ef70af9fdc823407ddc4ae14766806d4837a.tar.gz |
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 <kwolf@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r-- | block.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -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); |