From patchwork Wed Nov 28 15:21:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 202478 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 0B8AE2C008C for ; Thu, 29 Nov 2012 02:22:54 +1100 (EST) Received: from localhost ([::1]:35810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdjTQ-0001h8-0B for incoming@patchwork.ozlabs.org; Wed, 28 Nov 2012 10:22:52 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdjT3-0001HI-Dm for qemu-devel@nongnu.org; Wed, 28 Nov 2012 10:22:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TdjSt-0000qf-Mp for qemu-devel@nongnu.org; Wed, 28 Nov 2012 10:22:29 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:54940) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdjSt-0000qB-HV for qemu-devel@nongnu.org; Wed, 28 Nov 2012 10:22:19 -0500 Received: by mail-pa0-f45.google.com with SMTP id bg2so6911923pad.4 for ; Wed, 28 Nov 2012 07:22:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=8eLUi+8+HF4C85HryawTxE032DBjqH6LR707jvX+9aM=; b=RONfk4S/dqzXi8zVp1GlEcNY5O7Fe/OY5R8PvZjGWuPDT6FnpHu7Qb6uwe1gIWi1MM FWs5PAVaY969e5KzByzqs7DwG/I1Ny3++HJ8k6BZ4z27t/7xZ0nBXxbMm+n+JP3fudP0 s3smWjK1lQygSeO6ZFX6bIu+UpaOTI+gDHxkvOkH9DBmOXg0drEoN8qbhwnSXK1mh9z9 jnxjCmi0ohNQXocV3+iaaykcp/DpzPeKMxUEykeyQIDtQDp08C6QHSRORh6ykHrZirC+ AJnyX/D67oih2OEOm7hF8BuF1HKEPQWrTO9PWSBpemIPGu2CM5rIjz1DrxzxXqfzluKa /19g== Received: by 10.66.72.71 with SMTP id b7mr52745922pav.28.1354116139162; Wed, 28 Nov 2012 07:22:19 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id p5sm12448779paz.22.2012.11.28.07.22.15 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Nov 2012 07:22:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 28 Nov 2012 16:21:49 +0100 Message-Id: <1354116110-28651-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1354116110-28651-1-git-send-email-pbonzini@redhat.com> References: <1354116110-28651-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.45 Cc: aliguori@us.ibm.com, Paul 'Rusty' Russell , David Gibson Subject: [Qemu-devel] [PATCH 4/5] virtio-scsi: Fix some endian bugs with virtio-scsi 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 From: David Gibson The virtio-scsi specification does not specify the correct endianness for fields in the request structure. It's therefore best to assume that it is "guest native" endian since that's the (stupid and poorly defined) norm in virtio. However, the qemu device for virtio-scsi has no byteswaps at all, and so will break if the guest has different endianness from the host. This patch fixes it by adding tswap() calls for the sense_len and resid fields in the request structure. In theory status_qualifier needs swaps as well, but that field is never actually touched. The tag field is a uint64_t, but since its value is completely arbitrary, it might as well be uint8_t[8] and so it does not need swapping. Cc: Paolo Bonzini Cc: Paul 'Rusty' Russell Signed-off-by: David Gibson Signed-off-by: Paolo Bonzini --- hw/virtio-scsi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index 7d546f6..924fc69 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -424,15 +424,17 @@ static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status, size_t resid) { VirtIOSCSIReq *req = r->hba_private; + uint32_t sense_len; req->resp.cmd->response = VIRTIO_SCSI_S_OK; req->resp.cmd->status = status; if (req->resp.cmd->status == GOOD) { - req->resp.cmd->resid = resid; + req->resp.cmd->resid = tswap32(resid); } else { req->resp.cmd->resid = 0; - req->resp.cmd->sense_len = - scsi_req_get_sense(r, req->resp.cmd->sense, VIRTIO_SCSI_SENSE_SIZE); + sense_len = scsi_req_get_sense(r, req->resp.cmd->sense, + VIRTIO_SCSI_SENSE_SIZE); + req->resp.cmd->sense_len = tswap32(sense_len); } virtio_scsi_complete_req(req); }