diff options
| author | Max Reitz <mreitz@redhat.com> | 2015-10-19 17:53:29 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-10-23 18:18:23 +0200 |
| commit | 5433c24f0f9306c82ad9bcc2b2b586e5f0ed8fa5 (patch) | |
| tree | 8b2eb29767ef12bf28d528050a0463b3e9458f5b /hw/block | |
| parent | 0c3c36d651922ebe9244e68e6d9ed14cdfcac9fd (diff) | |
| download | qemu-5433c24f0f9306c82ad9bcc2b2b586e5f0ed8fa5.zip qemu-5433c24f0f9306c82ad9bcc2b2b586e5f0ed8fa5.tar.gz qemu-5433c24f0f9306c82ad9bcc2b2b586e5f0ed8fa5.tar.bz2 | |
block: Prepare for NULL BDS
blk_bs() will not necessarily return a non-NULL value any more (unless
blk_is_available() is true or it can be assumed to otherwise, e.g.
because it is called immediately after a successful blk_new_with_bs() or
blk_new_open()).
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/xen_disk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 36d7398..1bbc111 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -931,9 +931,11 @@ static int blk_connect(struct XenDevice *xendev) blk_attach_dev_nofail(blkdev->blk, blkdev); blkdev->file_size = blk_getlength(blkdev->blk); if (blkdev->file_size < 0) { + BlockDriverState *bs = blk_bs(blkdev->blk); + const char *drv_name = bs ? bdrv_get_format_name(bs) : NULL; xen_be_printf(&blkdev->xendev, 1, "blk_getlength: %d (%s) | drv %s\n", (int)blkdev->file_size, strerror(-blkdev->file_size), - bdrv_get_format_name(blk_bs(blkdev->blk)) ?: "-"); + drv_name ?: "-"); blkdev->file_size = 0; } |