diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-11-18 16:31:59 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-11-22 10:33:30 +0100 |
| commit | 3a395142ba99197429a2378930d3c1551fc053cc (patch) | |
| tree | 1a0c0c8884aace35c913dd1e32f614dd49560515 /hw | |
| parent | 40897c9c160393df922dfdb59cfa210048d3071d (diff) | |
| download | qemu-3a395142ba99197429a2378930d3c1551fc053cc.zip qemu-3a395142ba99197429a2378930d3c1551fc053cc.tar.gz qemu-3a395142ba99197429a2378930d3c1551fc053cc.tar.bz2 | |
virtio-blk: fix cross-endian config space
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/virtio-blk.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 19e89e7..d6d1f87 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -485,6 +485,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) struct virtio_blk_config blkcfg; uint64_t capacity; int cylinders, heads, secs; + int blk_size = s->conf->logical_block_size; bdrv_get_geometry(s->bs, &capacity); bdrv_get_geometry_hint(s->bs, &cylinders, &heads, &secs); @@ -492,14 +493,14 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) stq_raw(&blkcfg.capacity, capacity); stl_raw(&blkcfg.seg_max, 128 - 2); stw_raw(&blkcfg.cylinders, cylinders); + stl_raw(&blkcfg.blk_size, blk_size); + stw_raw(&blkcfg.min_io_size, s->conf->min_io_size / blk_size); + stw_raw(&blkcfg.opt_io_size, s->conf->opt_io_size / blk_size); blkcfg.heads = heads; blkcfg.sectors = secs & ~s->sector_mask; - blkcfg.blk_size = s->conf->logical_block_size; blkcfg.size_max = 0; blkcfg.physical_block_exp = get_physical_block_exp(s->conf); blkcfg.alignment_offset = 0; - blkcfg.min_io_size = s->conf->min_io_size / blkcfg.blk_size; - blkcfg.opt_io_size = s->conf->opt_io_size / blkcfg.blk_size; memcpy(config, &blkcfg, sizeof(struct virtio_blk_config)); } |