diff options
| author | Stefan Hajnoczi | 2017-08-08 14:22:51 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2017-08-10 15:33:43 +0200 |
| commit | 17d0bc01bfcce0ad4fb5105d4502595224569ff0 (patch) | |
| tree | 5cea212defac3e69cc37a34936704a172f60114d | |
| parent | IDE: test flush on empty CDROM (diff) | |
| download | qemu-17d0bc01bfcce0ad4fb5105d4502595224569ff0.tar.gz qemu-17d0bc01bfcce0ad4fb5105d4502595224569ff0.tar.xz qemu-17d0bc01bfcce0ad4fb5105d4502595224569ff0.zip | |
virtio-blk: handle blk_getlength() errors
If blk_getlength() fails in virtio_blk_update_config() consider the disk
image length to be 0 bytes.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20170808122251.29815-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/block/virtio-blk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index b750bd8b53..a16ac75090 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -730,6 +730,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) BlockConf *conf = &s->conf.conf; struct virtio_blk_config blkcfg; uint64_t capacity; + int64_t length; int blk_size = conf->logical_block_size; blk_get_geometry(s->blk, &capacity); @@ -752,7 +753,8 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) * divided by 512 - instead it is the amount of blk_size blocks * per track (cylinder). */ - if (blk_getlength(s->blk) / conf->heads / conf->secs % blk_size) { + length = blk_getlength(s->blk); + if (length > 0 && length / conf->heads / conf->secs % blk_size) { blkcfg.geometry.sectors = conf->secs & ~s->sector_mask; } else { blkcfg.geometry.sectors = conf->secs; |