From patchwork Wed Nov 24 08:18:43 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: 72813 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 21533B70A3 for ; Wed, 24 Nov 2010 19:20:47 +1100 (EST) Received: from localhost ([127.0.0.1]:57521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLAaq-000509-A9 for incoming@patchwork.ozlabs.org; Wed, 24 Nov 2010 03:20:44 -0500 Received: from [140.186.70.92] (port=54333 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLAZ0-0004K9-Vh for qemu-devel@nongnu.org; Wed, 24 Nov 2010 03:18:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PLAYz-0003gd-Ll for qemu-devel@nongnu.org; Wed, 24 Nov 2010 03:18:50 -0500 Received: from nm30.bullet.mail.ac4.yahoo.com ([98.139.52.227]:30589) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1PLAYz-0003gU-E3 for qemu-devel@nongnu.org; Wed, 24 Nov 2010 03:18:49 -0500 Received: from [98.139.52.191] by nm30.bullet.mail.ac4.yahoo.com with NNFMP; 24 Nov 2010 08:18:48 -0000 Received: from [98.139.52.128] by tm4.bullet.mail.ac4.yahoo.com with NNFMP; 24 Nov 2010 08:18:48 -0000 Received: from [127.0.0.1] by omp1011.mail.ac4.yahoo.com with NNFMP; 24 Nov 2010 08:18:48 -0000 X-Yahoo-Newman-Id: 75272.79699.bm@omp1011.mail.ac4.yahoo.com Received: (qmail 85806 invoked from network); 24 Nov 2010 08:18:47 -0000 Received: from localhost.localdomain (nab@70.231.233.146 with login) by smtp110.sbc.mail.mud.yahoo.com with SMTP; 24 Nov 2010 00:18:47 -0800 PST X-Yahoo-SMTP: fzDSGlOswBCWnIOrNw7KwwK1j9PqyNbe5PtLKiS4dDU.UNl_t6bdEZu9tTLW X-YMail-OSG: 55NbhQ4VM1ldVuYgQpmcrAEuLfiwXSLk1pCSWfRIgcAhjwx z8QcHiomLil10oV02KISHg4GzaOY9vnSoq7X7bqozgsrIjmeOuC7YFGk4QIV fH_Jz2tw7z3PQwm6gh9SPVEZnWDO5PjyAGRcj.Wu._cRKnhCnctREjHuVkrm wJ3KF32L4AQeXVNfZ6Y1.in9skYQvk5yxUgFtzPRcpIWN2fyntwUSNTDQDwy 5GXW8GL6XhKpWeS5xnhc_3d8cWk.tZuunSFCTDS6pKJTaGU4z6yRymwQ06WP 6sSwQXz4mMXlSvYjDiEgMJudD6Bia2K1VUFJjEzc3pUM9jm6FWpqrBBdUK3D wKKrPXQZ9HcFC X-Yahoo-Newman-Property: ymail-3 From: "Nicholas A. Bellinger" To: Hannes Reinecke , Kevin Wolf Date: Wed, 24 Nov 2010 00:18:43 -0800 Message-Id: <1290586723-8724-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: Genre and OS details not recognized. Cc: qemu-devel , Stefan Hajnoczi , Gerd Hoffmann , Nicholas Bellinger , Paolo Bonzini Subject: [Qemu-devel] [PATCH] scsi-generic: bugfixes for 'SCSIRequest' conversion 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 adds a handful of bugfixes for scsi-generic that where added into: commit a4194b3f79a85e111f000788ddec05d465748851 Author: Hannes Reinecke Date: Mon Nov 22 15:39:33 2010 -0800 scsi: Use 'SCSIRequest' directly this includes: *) Fix incorrect errno usage in switch() statement within scsi_command_complete() *) Remove bogus scsi_command_complete() for residual case within scsi_read_complete() *) Remove incorrect '-' sign from return in scsi_send_command() Tested with .37-rc2 TCM_Loop FILEIO backstores on KVM host into Debian Lenny v2.6.26 KVM guest with an xfs filesystem mount. Signed-off-by: Nicholas A. Bellinger nab@linux-iscsi.org> --- hw/scsi-generic.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 7d30115..dc277cc 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -146,13 +146,13 @@ static void scsi_command_complete(void *opaque, int ret) if (ret != 0) { switch(ret) { - case ENODEV: + case -ENODEV: s->senselen = scsi_set_sense(s, SENSE_CODE(LUN_NOT_SUPPORTED)); break; - case EINVAL: + case -EINVAL: s->senselen = scsi_set_sense(s, SENSE_CODE(INVALID_FIELD)); break; - case EBADR: + case -EBADR: s->senselen = scsi_set_sense(s, SENSE_CODE(TARGET_FAILURE)); break; default: @@ -230,12 +230,10 @@ static void scsi_read_complete(void * opaque, int ret) return; } len = r->io_header.dxfer_len - r->io_header.resid; - DPRINTF("Data ready tag=0x%x len=%d\n", r->req.tag, len); + DPRINTF("Data ready tag=0x%x remaining len=%d\n", r->req.tag, len); r->len = -1; r->req.bus->complete(&r->req, SCSI_REASON_DATA, len); - if (len == 0) - scsi_command_complete(r, 0); } /* Read more data from scsi device into buffer. */ @@ -375,7 +373,7 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd) } scsi_req_fixup(&r->req); - DPRINTF("Command: lun=%d tag=0x%x len %zd data=0x%02x", lun, tag, + DPRINTF("Command: lun=%d tag=0x%x len %zd data=0x%02x", req->lun, req->tag, r->req.cmd.xfer, cmd[0]); #ifdef DEBUG_SCSI @@ -414,7 +412,7 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd) r->len = r->req.cmd.xfer; if (r->req.cmd.mode == SCSI_XFER_TO_DEV) { r->len = 0; - return -r->req.cmd.xfer; + return r->req.cmd.xfer; } return r->req.cmd.xfer;