From nobody Mon Feb 9 02:27:30 2026 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 1505868493606865.2260267781203; Tue, 19 Sep 2017 17:48:13 -0700 (PDT) Received: from localhost ([::1]:46031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duTBS-0005dL-R0 for importer@patchew.org; Tue, 19 Sep 2017 20:48:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duT9N-0004KK-Nz for qemu-devel@nongnu.org; Tue, 19 Sep 2017 20:46:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duT9I-0005YL-SY for qemu-devel@nongnu.org; Tue, 19 Sep 2017 20:46:01 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:34158 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duT9I-0005Xl-Ms for qemu-devel@nongnu.org; Tue, 19 Sep 2017 20:45:56 -0400 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v8K0hcvT015487 for ; Tue, 19 Sep 2017 20:45:56 -0400 Received: from e19.ny.us.ibm.com (e19.ny.us.ibm.com [129.33.205.209]) by mx0b-001b2d01.pphosted.com with ESMTP id 2d3akjtpaq-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 19 Sep 2017 20:45:55 -0400 Received: from localhost by e19.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 Sep 2017 20:45:55 -0400 Received: from b01cxnp22036.gho.pok.ibm.com (9.57.198.26) by e19.ny.us.ibm.com (146.89.104.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 19 Sep 2017 20:45:52 -0400 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v8K0jpOA50069628; Wed, 20 Sep 2017 00:45:51 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F0205AE03C; Tue, 19 Sep 2017 20:46:22 -0400 (EDT) Received: from localhost (unknown [9.80.107.19]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP id A9A75AE03B; Tue, 19 Sep 2017 20:46:22 -0400 (EDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 19:45:19 -0500 X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170920004521.9417-1-mdroth@linux.vnet.ibm.com> References: <20170920004521.9417-1-mdroth@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17092000-0056-0000-0000-000003CBE103 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007765; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000230; SDB=6.00919509; UDB=6.00461959; IPR=6.00699736; BA=6.00005598; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017216; XFM=3.00000015; UTC=2017-09-20 00:45:53 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17092000-0057-0000-0000-00000802E49D Message-Id: <20170920004521.9417-11-mdroth@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-09-19_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709200008 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 10/12] 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: Paolo Bonzini , Hannes Reinecke , qemu-stable@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" From: Hannes Reinecke According to SPC-3 INQUIRY and REQUEST SENSE should return GOOD even on unsupported LUNS. Signed-off-by: Hannes Reinecke Message-Id: <1503049022-14749-1-git-send-email-hare@suse.de> Reported-by: Laszlo Ersek Fixes: ded6ddc5a7b95217557fa360913d1213e12d4a6d Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Hannes Reinecke (cherry picked from commit b07fbce6349c7b84642e7ed56c7a1ac3c1caca61) Signed-off-by: Michael Roth --- 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.11.0