From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RU0D2-0007zl-5c for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RU0D0-0005jp-UU for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RU0D0-0005jk-MM for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:10 -0500 From: Kevin Wolf Date: Fri, 25 Nov 2011 19:12:04 +0100 Message-Id: <1322244735-12516-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1322244735-12516-1-git-send-email-kwolf@redhat.com> References: <1322244735-12516-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 01/12] virtio-blk: fix cross-endian config space List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- 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.6.4