From patchwork Mon May 31 01:43:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 54008 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 09F3AB7D47 for ; Mon, 31 May 2010 11:49:53 +1000 (EST) Received: from localhost ([127.0.0.1]:41381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OIu3j-0005qc-0h for incoming@patchwork.ozlabs.org; Sun, 30 May 2010 21:44:55 -0400 Received: from [140.186.70.92] (port=46836 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OIu1e-0004lV-DA for qemu-devel@nongnu.org; Sun, 30 May 2010 21:42:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OIu1d-0000k5-G0 for qemu-devel@nongnu.org; Sun, 30 May 2010 21:42:46 -0400 Received: from smtp127.sbc.mail.sp1.yahoo.com ([69.147.65.186]:47004) by eggs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1OIu1d-0000k0-7Z for qemu-devel@nongnu.org; Sun, 30 May 2010 21:42:45 -0400 Received: (qmail 87483 invoked from network); 31 May 2010 01:42:44 -0000 Received: from adsl-70-231-238-2.dsl.snfc21.sbcglobal.net (nab@70.231.238.2 with login) by smtp127.sbc.mail.sp1.yahoo.com with SMTP; 30 May 2010 18:42:44 -0700 PDT X-Yahoo-SMTP: fzDSGlOswBCWnIOrNw7KwwK1j9PqyNbe5PtLKiS4dDU.UNl_t6bdEZu9tTLW X-YMail-OSG: LoshYEQVM1mgwGHn6v8Q5_WhAYBW1329lSBdnQA70HFTsU7U3D2MAxUn_uPVATXh7LAN_rqBnFCc0Y4njSCo.ADiUSS8bxB0sqigUET2acU5UPtUa3rjaNMzKJtTbuqlnN1VK9JvUzoupnOOyY75yKRu_x2iFm8zsehTNMHQe9xAsgqLI2qTR22Kl9b3oVJ.RRVqVLnA0OnA.SVBjMW83RIeApgQMXSHweArmSO5zSk.ivnqNtoGQLsj15fxx8puJVQPIPNoCova7asRIdtggo0sCICgUWeIFHzw15d3W1mhUSWHoDxkQ7QEcldqxKeyRH.1qtb2CmqXQzxdgdbyR0UFofmLyVETr81Mg1GhVH6vTw-- X-Yahoo-Newman-Property: ymail-3 From: "Nicholas A. Bellinger" To: Kevin Wolf , Gerd Hoffmann Date: Sun, 30 May 2010 18:43:01 -0700 Message-Id: <1275270181-10992-1-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.5.6.5 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) Cc: kvm-devel , qemu-devel , Nicholas Bellinger , Paul Brook , Christoph Hellwig , Hannes Reinecke Subject: [Qemu-devel] [PATCH 1/2] [scsi-bus]: Add PR-OUT and PR-IN case for SCSIRequest xfer and xfer_mode setup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Nicholas Bellinger This patch updates hw/scsi-bus.c to add PERSISTENT_RESERVE_OUT and PERSISTENT_RESERVE_IN case in scsi_req_length() to extra the incoming buffer length into SCSIRequest->cmd.xfer, and adds a second PERSISTENT_RESERVE_OUT case in scsi_req_xfer_mode() in order to properly set SCSI_XFER_TO_DEV for WRITE data. Tested with Linux KVM guests and Megasas 8708EM2 HBA emulation and TCM_Loop target ports. Signed-off-by: Nicholas A. Bellinger --- hw/scsi-bus.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index b8e4b71..75ec74e 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -325,6 +325,10 @@ static int scsi_req_length(SCSIRequest *req, uint8_t *cmd) case INQUIRY: req->cmd.xfer = cmd[4] | (cmd[3] << 8); break; + case PERSISTENT_RESERVE_OUT: + case PERSISTENT_RESERVE_IN: + req->cmd.xfer = cmd[8] | (cmd[7] << 8); + break; } return 0; } @@ -389,6 +393,7 @@ static void scsi_req_xfer_mode(SCSIRequest *req) case MEDIUM_SCAN: case SEND_VOLUME_TAG: case WRITE_LONG_2: + case PERSISTENT_RESERVE_OUT: req->cmd.mode = SCSI_XFER_TO_DEV; break; default: