From patchwork Wed Aug 3 08:49:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 108082 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 2D803B71D7 for ; Wed, 3 Aug 2011 19:57:05 +1000 (EST) Received: from localhost ([::1]:55025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QoXA2-0008Qb-W0 for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 04:50:42 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QoX91-0005xR-SE for qemu-devel@nongnu.org; Wed, 03 Aug 2011 04:49:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QoX8z-0003j6-2P for qemu-devel@nongnu.org; Wed, 03 Aug 2011 04:49:39 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:42749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QoX8y-0003g6-TE for qemu-devel@nongnu.org; Wed, 03 Aug 2011 04:49:37 -0400 Received: by mail-ww0-f53.google.com with SMTP id 26so527679wwf.10 for ; Wed, 03 Aug 2011 01:49:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=4rgVVwZqyi0CNy4jNKN8EG1Agsu0RluJzjXpnIr4uYw=; b=G+JpFEbffAObn6zIY3dUn/NIV78Ke1sC8aJce/OSSYHI+5Csmn5FMz8VUKJ7o54N5W 0wnf0zICCkVbJFMrLS4kwr4vTZigQz16LTAkalRmDMhqJe467dO6nf60+9kRDk6YGZ8S TFRAF6yP41jaU9JEOfb9qk8XEyAebEO1AOrPM= Received: by 10.216.163.16 with SMTP id z16mr444533wek.5.1312361376273; Wed, 03 Aug 2011 01:49:36 -0700 (PDT) Received: from localhost.localdomain (93-34-199-31.ip51.fastwebnet.it [93.34.199.31]) by mx.google.com with ESMTPS id ff6sm485877wbb.66.2011.08.03.01.49.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Aug 2011 01:49:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 10:49:15 +0200 Message-Id: <1312361359-15445-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1312361359-15445-1-git-send-email-pbonzini@redhat.com> References: <1312361359-15445-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Subject: [Qemu-devel] [PATCH 12/16] scsi: move handling of REQUEST SENSE to common code 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 --- hw/scsi-bus.c | 12 ++++++++++-- hw/scsi-disk.c | 9 ++------- hw/scsi-generic.c | 16 ---------------- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 139f6a6..fbb9801 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -270,6 +270,13 @@ static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) goto illegal_request; } break; + case REQUEST_SENSE: + if (req->cmd.xfer < 4) { + goto illegal_request; + } + r->len = scsi_device_get_sense(r->req.dev, r->buf, req->cmd.xfer, + (req->cmd.buf[1] & 1) == 0); + break; default: scsi_req_build_sense(req, SENSE_CODE(LUN_NOT_SUPPORTED)); scsi_req_complete(req, CHECK_CONDITION); @@ -351,8 +358,9 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun, cmd.lba); } - if ((lun != d->lun && buf[0] != REQUEST_SENSE) || - buf[0] == REPORT_LUNS) { + if (lun != d->lun || + buf[0] == REPORT_LUNS || + buf[0] == REQUEST_SENSE) { req = scsi_req_alloc(&reqops_target_command, d, tag, lun, hba_private); } else { diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index a5fdb05..5f21d68 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -792,12 +792,6 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) if (!bdrv_is_inserted(s->bs)) goto not_ready; break; - case REQUEST_SENSE: - if (req->cmd.xfer < 4) - goto illegal_request; - buflen = scsi_device_get_sense(&s->qdev, outbuf, req->cmd.xfer, - (req->cmd.buf[1] & 1) == 0); - break; case INQUIRY: buflen = scsi_disk_emulate_inquiry(req, outbuf); if (buflen < 0) @@ -974,7 +968,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) switch (command) { case TEST_UNIT_READY: - case REQUEST_SENSE: case INQUIRY: case MODE_SENSE: case MODE_SENSE_10: @@ -1074,6 +1067,8 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) } break; + case REQUEST_SENSE: + abort(); default: DPRINTF("Unknown SCSI command (%2.2x)\n", buf[0]); scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE)); diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 5217aaf..c122ad3 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -183,22 +183,6 @@ static void scsi_read_data(SCSIRequest *req) return; } - if (r->req.cmd.buf[0] == REQUEST_SENSE) { - r->io_header.driver_status = 0; - r->io_header.status = 0; - r->io_header.dxfer_len = - scsi_device_get_sense(&s->qdev, r->buf, r->req.cmd.xfer, - (r->req.cmd.buf[1] & 1) == 0); - r->len = -1; - DPRINTF("Data ready tag=0x%x len=%d\n", r->req.tag, r->io_header.dxfer_len); - DPRINTF("Sense: %d %d %d %d %d %d %d %d\n", - r->buf[0], r->buf[1], r->buf[2], r->buf[3], - r->buf[4], r->buf[5], r->buf[6], r->buf[7]); - scsi_req_data(&r->req, r->io_header.dxfer_len); - /* The sense buffer is cleared when we return GOOD */ - return; - } - ret = execute_command(s->bs, r, SG_DXFER_FROM_DEV, scsi_read_complete); if (ret < 0) { scsi_command_complete(r, ret);