|
 |
2a7a602 |
From b07725e3e5e05610691815ee921a6b3307685815 Mon Sep 17 00:00:00 2001
|
|
|
2a7a602 |
From: Hannes Reinecke <hare@suse.de>
|
|
|
2a7a602 |
Date: Fri, 18 Aug 2017 11:37:02 +0200
|
|
|
2a7a602 |
Subject: [PATCH 03/15] scsi-bus: correct responses for INQUIRY and REQUEST
|
|
|
2a7a602 |
SENSE
|
|
|
2a7a602 |
|
|
|
2a7a602 |
According to SPC-3 INQUIRY and REQUEST SENSE should return GOOD
|
|
|
2a7a602 |
even on unsupported LUNS.
|
|
|
2a7a602 |
|
|
|
2a7a602 |
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
|
|
2a7a602 |
Message-Id: <1503049022-14749-1-git-send-email-hare@suse.de>
|
|
|
2a7a602 |
Reported-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
2a7a602 |
Fixes: ded6ddc5a7b95217557fa360913d1213e12d4a6d
|
|
|
2a7a602 |
Cc: qemu-stable@nongnu.org
|
|
|
2a7a602 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
2a7a602 |
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
|
2a7a602 |
---
|
|
|
2a7a602 |
hw/scsi/scsi-bus.c | 29 +++++++++++++++++++++++++----
|
|
|
2a7a602 |
1 file changed, 25 insertions(+), 4 deletions(-)
|
|
|
2a7a602 |
|
|
|
2a7a602 |
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
|
|
|
2a7a602 |
index e364410a23..ade31c11f5 100644
|
|
|
2a7a602 |
--- a/hw/scsi/scsi-bus.c
|
|
|
2a7a602 |
+++ b/hw/scsi/scsi-bus.c
|
|
|
2a7a602 |
@@ -516,8 +516,10 @@ static size_t scsi_sense_len(SCSIRequest *req)
|
|
|
2a7a602 |
static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf)
|
|
|
2a7a602 |
{
|
|
|
2a7a602 |
SCSITargetReq *r = DO_UPCAST(SCSITargetReq, req, req);
|
|
|
2a7a602 |
+ int fixed_sense = (req->cmd.buf[1] & 1) == 0;
|
|
|
2a7a602 |
|
|
|
2a7a602 |
- if (req->lun != 0) {
|
|
|
2a7a602 |
+ if (req->lun != 0 &&
|
|
|
2a7a602 |
+ buf[0] != INQUIRY && buf[0] != REQUEST_SENSE) {
|
|
|
2a7a602 |
scsi_req_build_sense(req, SENSE_CODE(LUN_NOT_SUPPORTED));
|
|
|
2a7a602 |
scsi_req_complete(req, CHECK_CONDITION);
|
|
|
2a7a602 |
return 0;
|
|
|
2a7a602 |
@@ -535,9 +537,28 @@ static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf)
|
|
|
2a7a602 |
break;
|
|
|
2a7a602 |
case REQUEST_SENSE:
|
|
|
2a7a602 |
scsi_target_alloc_buf(&r->req, scsi_sense_len(req));
|
|
|
2a7a602 |
- r->len = scsi_device_get_sense(r->req.dev, r->buf,
|
|
|
2a7a602 |
- MIN(req->cmd.xfer, r->buf_len),
|
|
|
2a7a602 |
- (req->cmd.buf[1] & 1) == 0);
|
|
|
2a7a602 |
+ if (req->lun != 0) {
|
|
|
2a7a602 |
+ const struct SCSISense sense = SENSE_CODE(LUN_NOT_SUPPORTED);
|
|
|
2a7a602 |
+
|
|
|
2a7a602 |
+ if (fixed_sense) {
|
|
|
2a7a602 |
+ r->buf[0] = 0x70;
|
|
|
2a7a602 |
+ r->buf[2] = sense.key;
|
|
|
2a7a602 |
+ r->buf[10] = 10;
|
|
|
2a7a602 |
+ r->buf[12] = sense.asc;
|
|
|
2a7a602 |
+ r->buf[13] = sense.ascq;
|
|
|
2a7a602 |
+ r->len = MIN(req->cmd.xfer, SCSI_SENSE_LEN);
|
|
|
2a7a602 |
+ } else {
|
|
|
2a7a602 |
+ r->buf[0] = 0x72;
|
|
|
2a7a602 |
+ r->buf[1] = sense.key;
|
|
|
2a7a602 |
+ r->buf[2] = sense.asc;
|
|
|
2a7a602 |
+ r->buf[3] = sense.ascq;
|
|
|
2a7a602 |
+ r->len = 8;
|
|
|
2a7a602 |
+ }
|
|
|
2a7a602 |
+ } else {
|
|
|
2a7a602 |
+ r->len = scsi_device_get_sense(r->req.dev, r->buf,
|
|
|
2a7a602 |
+ MIN(req->cmd.xfer, r->buf_len),
|
|
|
2a7a602 |
+ fixed_sense);
|
|
|
2a7a602 |
+ }
|
|
|
2a7a602 |
if (r->req.dev->sense_is_ua) {
|
|
|
2a7a602 |
scsi_device_unit_attention_reported(req->dev);
|
|
|
2a7a602 |
r->req.dev->sense_len = 0;
|
|
|
2a7a602 |
--
|
|
|
2a7a602 |
2.13.5
|
|
|
2a7a602 |
|