From patchwork Mon Nov 14 09:40:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 125511 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 46E94B7200 for ; Mon, 14 Nov 2011 21:03:20 +1100 (EST) Received: from localhost ([::1]:58929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPt2q-0005V2-RM for incoming@patchwork.ozlabs.org; Mon, 14 Nov 2011 04:41:40 -0500 Received: from eggs.gnu.org ([140.186.70.92]:41568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPt2A-0003HW-EV for qemu-devel@nongnu.org; Mon, 14 Nov 2011 04:40:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPt28-00019t-DX for qemu-devel@nongnu.org; Mon, 14 Nov 2011 04:40:58 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:45483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPt28-00017I-7v for qemu-devel@nongnu.org; Mon, 14 Nov 2011 04:40:56 -0500 Received: by mail-iy0-f173.google.com with SMTP id k32so8306342iak.4 for ; Mon, 14 Nov 2011 01:40:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=MBEITDHsWESJ5esP7tITutR8zxfh9U4rYTGUYQ5U+bc=; b=OGuIigcy9x+/BDUlmByp1Lq2Uf98w4mkSSP/E3F3al+MrcM6oIMU6vAMmQbA09ao4d QUA7oe+Y4xJsih0ukHw6QcAwbCwJ76DFmc1Kx6KfJgfMjMz4kryHAc9XxGAHOnrUQf5M 7DGrRpb4Q1TxdEy7EZ8k4hmiauBOyDcCN7TXs= Received: by 10.42.41.143 with SMTP id p15mr22123301ice.9.1321263655941; Mon, 14 Nov 2011 01:40:55 -0800 (PST) Received: from localhost.localdomain (93-34-178-161.ip50.fastwebnet.it. [93.34.178.161]) by mx.google.com with ESMTPS id jm11sm29698936ibb.1.2011.11.14.01.40.53 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Nov 2011 01:40:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 14 Nov 2011 10:40:29 +0100 Message-Id: <1321263630-546-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1321263630-546-1-git-send-email-pbonzini@redhat.com> References: <1321263630-546-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH v2 5/6] scsi: pass down REQUEST SENSE to the device when there is no stored sense 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 This will let scsi-block/scsi-generic report progress on long operations. Reported-by: Thomas Schmitt Tested-by: Thomas Schmitt Signed-off-by: Paolo Bonzini --- hw/scsi-bus.c | 4 +--- hw/scsi-disk.c | 8 ++++++-- hw/scsi.h | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 736dcbb..33bafbb 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -10,8 +10,6 @@ static char *scsibus_get_fw_dev_path(DeviceState *dev); static int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf); static void scsi_req_dequeue(SCSIRequest *req); -static int scsi_build_sense(uint8_t *in_buf, int in_len, - uint8_t *buf, int len, bool fixed); static struct BusInfo scsi_bus_info = { .name = "SCSI", @@ -504,7 +502,7 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun, hba_private); } else if (lun != d->lun || buf[0] == REPORT_LUNS || - buf[0] == REQUEST_SENSE) { + (buf[0] == REQUEST_SENSE && (d->sense_len || cmd.xfer < 4))) { 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 9224b04..c2a3864 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1210,6 +1210,11 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r) outbuf[7] = 0; buflen = 8; break; + case REQUEST_SENSE: + /* Just return "NO SENSE". */ + buflen = scsi_build_sense(NULL, 0, outbuf, r->buflen, + (req->cmd.buf[1] & 1) == 0); + break; case MECHANISM_STATUS: buflen = scsi_emulate_mechanism_status(s, outbuf); if (buflen < 0) { @@ -1344,6 +1349,7 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) case GET_EVENT_STATUS_NOTIFICATION: case MECHANISM_STATUS: case SERVICE_ACTION_IN_16: + case REQUEST_SENSE: case VERIFY_10: rc = scsi_disk_emulate_command(r); if (rc < 0) { @@ -1435,8 +1441,6 @@ 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.h b/hw/scsi.h index 796ecf1..c790acc 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -182,6 +182,8 @@ extern const struct SCSISense sense_code_DEVICE_INTERNAL_RESET; #define SENSE_CODE(x) sense_code_ ## x int scsi_sense_valid(SCSISense sense); +int scsi_build_sense(uint8_t *in_buf, int in_len, + uint8_t *buf, int len, bool fixed); SCSIRequest *scsi_req_alloc(const SCSIReqOps *reqops, SCSIDevice *d, uint32_t tag, uint32_t lun, void *hba_private);