mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-blk: handle blk_getlength() errors

Browse Source 
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>
This commit is contained in:
Stefan Hajnoczi 2017-08-08 13:22:51 +01:00
parent ce317e8dea
commit 17d0bc01bf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/block/virtio-blk.c
View File

@ -730,6 +730,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
BlockConf *conf = &s->conf.conf; BlockConf *conf = &s->conf.conf;
struct virtio_blk_config blkcfg; struct virtio_blk_config blkcfg;
uint64_t capacity; uint64_t capacity;
int64_t length;
int blk_size = conf->logical_block_size; int blk_size = conf->logical_block_size;
blk_get_geometry(s->blk, &capacity); 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 * divided by 512 - instead it is the amount of blk_size blocks
* per track (cylinder). * 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; blkcfg.geometry.sectors = conf->secs & ~s->sector_mask;
} else { } else {
blkcfg.geometry.sectors = conf->secs; blkcfg.geometry.sectors = conf->secs;