From patchwork Mon Nov 26 01:33:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 201608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C038A2C007C for ; Mon, 26 Nov 2012 12:32:20 +1100 (EST) Received: from localhost ([::1]:45390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcnYY-0004s4-P1 for incoming@patchwork.ozlabs.org; Sun, 25 Nov 2012 20:32:18 -0500 Received: from eggs.gnu.org ([208.118.235.92]:37176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcnYS-0004qB-C9 for qemu-devel@nongnu.org; Sun, 25 Nov 2012 20:32:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcnYQ-0002SN-VH for qemu-devel@nongnu.org; Sun, 25 Nov 2012 20:32:12 -0500 Received: from ozlabs.org ([203.10.76.45]:56013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcnYQ-0002S2-K2 for qemu-devel@nongnu.org; Sun, 25 Nov 2012 20:32:10 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 0CF9F2C0082; Mon, 26 Nov 2012 12:32:07 +1100 (EST) From: David Gibson To: aliguori@us.ibm.com, pbonzini@redhat.com Date: Mon, 26 Nov 2012 12:33:52 +1100 Message-Id: <1353893632-22442-1-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 203.10.76.45 Cc: Paul 'Rusty' Russell , qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH] virtio-scsi: Fix subtle (guest) endian bug 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 The virtio-scsi config space is, by specification, in guest endian (which is ill-defined, but there you go). In virtio_scsi_get_config() we set up all the fields in there, using stl_raw(). Which is a problem for the max_channel and max_target fields, which are 16-bit, not 32-bit. For little-endian targets we get away with it by accident, since the first two bytes will still be correct, and the extra two bytes written (with zeroes) will be overwritten correctly by the next store. But for big-endian guests, this means the max_target field ends up as zero, which means the guest will only recognize a single disk on the virtio-scsi bus. This patch fixes the problem. Cc: Paolo Bonzini Cc: Paul 'Rusty' Russell Signed-off-by: David Gibson --- hw/virtio-scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index 9d27d1d..6eb2e03 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -533,8 +533,8 @@ static void virtio_scsi_get_config(VirtIODevice *vdev, stl_raw(&scsiconf->event_info_size, sizeof(VirtIOSCSIEvent)); stl_raw(&scsiconf->sense_size, s->sense_size); stl_raw(&scsiconf->cdb_size, s->cdb_size); - stl_raw(&scsiconf->max_channel, VIRTIO_SCSI_MAX_CHANNEL); - stl_raw(&scsiconf->max_target, VIRTIO_SCSI_MAX_TARGET); + stw_raw(&scsiconf->max_channel, VIRTIO_SCSI_MAX_CHANNEL); + stw_raw(&scsiconf->max_target, VIRTIO_SCSI_MAX_TARGET); stl_raw(&scsiconf->max_lun, VIRTIO_SCSI_MAX_LUN); }