[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 10/38] virtio-blk: fix cross-endian config space
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 10/38] virtio-blk: fix cross-endian config space |
Date: |
Wed, 23 Nov 2011 11:45:00 +0000 |
From: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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));
}
--
1.7.7.1
- [Qemu-devel] [PATCH v3 02/38] scsi: fix fw path, (continued)
- [Qemu-devel] [PATCH v3 02/38] scsi: fix fw path, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 01/38] Documentation: Add section about iSCSI LUNS to qemu-doc, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 09/38] scsi-block: always use SG_IO for MMC devices, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 07/38] scsi: remove block descriptors from CDs, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 05/38] scsi: update list of commands, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 04/38] atapi: kill MODE SENSE(6), fix MODE SENSE(10), Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 08/38] scsi: pass down REQUEST SENSE to the device when there is no stored sense, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 06/38] scsi: fix parsing of allocation length field, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 13/38] scsi-generic: add as boot device, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 12/38] scsi: fix fw path, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 10/38] virtio-blk: fix cross-endian config space,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 03/38] scsi-disk: guess geometry, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 11/38] usb-msd: do not register twice in the boot order, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 14/38] qed: adjust the way to get nb_sectors, Stefan Hajnoczi, 2011/11/23
- Re: [Qemu-devel] [PATCH v3 00/38] block: generic copy-on-read, Stefan Hajnoczi, 2011/11/23