]> git.proxmox.com Git - mirror_qemu.git/commit
block: Fail gracefully with missing filename
authorKevin Wolf <kwolf@redhat.com>
Mon, 3 Feb 2014 13:49:42 +0000 (14:49 +0100)
committerKevin Wolf <kwolf@redhat.com>
Sun, 9 Feb 2014 08:12:38 +0000 (09:12 +0100)
commit765003db029ed4660a09807958276e251de84fac
tree2f4270288b6afdc804f0a6bc98783d29bbf2b795
parent170632dbc9f75217861dd8bf2e6da3c269a1ba18
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 <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
block.c
tests/qemu-iotests/051
tests/qemu-iotests/051.out