From nobody Thu May 2 14:25:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1503049110521463.8127080779036; Fri, 18 Aug 2017 02:38:30 -0700 (PDT) Received: from localhost ([::1]:39044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1didjY-0007aB-EP for importer@patchew.org; Fri, 18 Aug 2017 05:38:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1didiL-0006vF-70 for qemu-devel@nongnu.org; Fri, 18 Aug 2017 05:37:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1didiI-0000B9-3p for qemu-devel@nongnu.org; Fri, 18 Aug 2017 05:37:13 -0400 Received: from mx2.suse.de ([195.135.220.15]:49712 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1didiH-0000Am-TN for qemu-devel@nongnu.org; Fri, 18 Aug 2017 05:37:10 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 7D218AC1A; Fri, 18 Aug 2017 09:37:08 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Hannes Reinecke To: Paolo Bonzini Date: Fri, 18 Aug 2017 11:37:02 +0200 Message-Id: <1503049022-14749-1-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 Subject: [Qemu-devel] [PATCH] scsi-bus: correct responses for INQUIRY and REQUEST SENSE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hannes Reinecke , Lazlo Ersek , qemu-devel@nongnu.org, Hannes Reinecke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" According to SPC-3 INQUIRY and REQUEST SENSE should return GOOD even on unsupported LUNS. Signed-off-by: Hannes Reinecke Reported-by: Laszlo Ersek Tested-by: Laszlo Ersek --- hw/scsi/scsi-bus.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index e364410a23..ade31c11f5 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -516,8 +516,10 @@ static size_t scsi_sense_len(SCSIRequest *req) static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) { SCSITargetReq *r =3D DO_UPCAST(SCSITargetReq, req, req); + int fixed_sense =3D (req->cmd.buf[1] & 1) =3D=3D 0; =20 - if (req->lun !=3D 0) { + if (req->lun !=3D 0 && + buf[0] !=3D INQUIRY && buf[0] !=3D REQUEST_SENSE) { scsi_req_build_sense(req, SENSE_CODE(LUN_NOT_SUPPORTED)); scsi_req_complete(req, CHECK_CONDITION); return 0; @@ -535,9 +537,28 @@ static int32_t scsi_target_send_command(SCSIRequest *r= eq, uint8_t *buf) break; case REQUEST_SENSE: scsi_target_alloc_buf(&r->req, scsi_sense_len(req)); - r->len =3D scsi_device_get_sense(r->req.dev, r->buf, - MIN(req->cmd.xfer, r->buf_len), - (req->cmd.buf[1] & 1) =3D=3D 0); + if (req->lun !=3D 0) { + const struct SCSISense sense =3D SENSE_CODE(LUN_NOT_SUPPORTED); + + if (fixed_sense) { + r->buf[0] =3D 0x70; + r->buf[2] =3D sense.key; + r->buf[10] =3D 10; + r->buf[12] =3D sense.asc; + r->buf[13] =3D sense.ascq; + r->len =3D MIN(req->cmd.xfer, SCSI_SENSE_LEN); + } else { + r->buf[0] =3D 0x72; + r->buf[1] =3D sense.key; + r->buf[2] =3D sense.asc; + r->buf[3] =3D sense.ascq; + r->len =3D 8; + } + } else { + r->len =3D scsi_device_get_sense(r->req.dev, r->buf, + MIN(req->cmd.xfer, r->buf_len), + fixed_sense); + } if (r->req.dev->sense_is_ua) { scsi_device_unit_attention_reported(req->dev); r->req.dev->sense_len =3D 0; --=20 2.12.0