From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RRQQK-0005yQ-Hq for qemu-devel@nongnu.org; Fri, 18 Nov 2011 10:32:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RRQQJ-0006s5-93 for qemu-devel@nongnu.org; Fri, 18 Nov 2011 10:32:16 -0500 Received: from mail-gy0-f173.google.com ([209.85.160.173]:52757) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RRQQJ-0006rz-6d for qemu-devel@nongnu.org; Fri, 18 Nov 2011 10:32:15 -0500 Received: by ghbg16 with SMTP id g16so806209ghb.4 for ; Fri, 18 Nov 2011 07:32:14 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 18 Nov 2011 16:31:59 +0100 Message-Id: <1321630322-19309-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1321630322-19309-1-git-send-email-pbonzini@redhat.com> References: <1321630322-19309-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] virtio-blk: fix cross-endian config space List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- v1->v2: do not rely on blkcfg since it is now guest-endian 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 01aeb28..0d6f53b 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -474,6 +474,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); @@ -481,14 +482,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