From patchwork Tue Nov 15 11:07:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 125745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DD002B6F7E for ; Tue, 15 Nov 2011 22:08:24 +1100 (EST) Received: from localhost ([::1]:49915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGsG-0006fL-5F for incoming@patchwork.ozlabs.org; Tue, 15 Nov 2011 06:08:20 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=49bgJXtr6yB3YZgEakNszp/I7mBupXWDfXAenFG9J+M=; b=dNTVLLPRgOKGrrcMrJ8Avrwhbde62M8+EbFzdDcpclYWCTYb4J9oQichUSNpHMzg3k llAJ/1OpGzGpmhHditIP9W0NOQGCzMbyaf/u+csRgQ06L3IriVOp0yRX3wFRAtoK+HRs KJaGusJ6U60XigFaeb3MjSfRxW5tC78ghkgh4= Received: by 10.231.44.196 with SMTP id b4mr6099060ibf.82.1321355283301; Tue, 15 Nov 2011 03:08:03 -0800 (PST) Received: from localhost.localdomain (93-34-207-114.ip51.fastwebnet.it. [93.34.207.114]) by mx.google.com with ESMTPS id jm11sm34541208ibb.1.2011.11.15.03.08.00 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Nov 2011 03:08:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 15 Nov 2011 12:07:53 +0100 Message-Id: <1321355273-6139-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH] virtio-blk: fix cross-endian config space X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Stefan Hajnoczi --- 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)); }