From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGs5-0006ex-9X for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:08:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQGs1-0007kj-GR for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:08:09 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:55614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGs1-0007kX-DM for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:08:05 -0500 Received: by iakk32 with SMTP id k32so9801355iak.4 for ; Tue, 15 Nov 2011 03:08:03 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 15 Nov 2011 12:07:53 +0100 Message-Id: <1321355273-6139-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] virtio-blk: fix cross-endian config space List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Paolo Bonzini --- hw/virtio-blk.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 01aeb28..4a15f0c 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -481,14 +481,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, s->conf->logical_block_size); + stw_raw(&blkcfg.min_io_size, s->conf->min_io_size / blkcfg.blk_size); + stw_raw(&blkcfg.opt_io_size, s->conf->opt_io_size / blkcfg.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