ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: clear unit attention only for REPORT LUNS commands 

scsi_clear_unit_attention() now only handles REPORTED LUNS DATA HAS
CHANGED.

This only happens when we handle REPORT LUNS commands, so let's rename
the function in scsi_clear_reported_luns_changed() and call it only in
scsi_target_emulate_report_luns().

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-ID: <20230712134352.118655-4-sgarzare@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Stefano Garzarella 2023-07-12 15:43:52 +02:00 committed by Paolo Bonzini
parent ba947dab98
commit 2eb5599e8a
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/scsi/scsi-bus.c
View File

@ -22,6 +22,7 @@ static char *scsibus_get_fw_dev_path(DeviceState *dev);
static void scsi_req_dequeue(SCSIRequest *req); static void scsi_req_dequeue(SCSIRequest *req);
static uint8_t *scsi_target_alloc_buf(SCSIRequest *req, size_t len); static uint8_t *scsi_target_alloc_buf(SCSIRequest *req, size_t len);
static void scsi_target_free_buf(SCSIRequest *req); static void scsi_target_free_buf(SCSIRequest *req);
static void scsi_clear_reported_luns_changed(SCSIRequest *req);
static int next_scsi_bus; static int next_scsi_bus;
@ -518,6 +519,14 @@ static bool scsi_target_emulate_report_luns(SCSITargetReq *r)
/* store the LUN list length */ /* store the LUN list length */
stl_be_p(&r->buf[0], len - 8); stl_be_p(&r->buf[0], len - 8);
/*
* If a REPORT LUNS command enters the enabled command state, [...]
* the device server shall clear any pending unit attention condition
* with an additional sense code of REPORTED LUNS DATA HAS CHANGED.
*/
scsi_clear_reported_luns_changed(&r->req);
return true; return true;
} }
@ -816,18 +825,10 @@ uint8_t *scsi_req_get_buf(SCSIRequest *req)
return req->ops->get_buf(req); return req->ops->get_buf(req);
} }
static void scsi_clear_unit_attention(SCSIRequest *req) static void scsi_clear_reported_luns_changed(SCSIRequest *req)
{ {
SCSISense *ua; SCSISense *ua;
/*
* scsi_fetch_unit_attention_sense() already cleaned the unit attention
* in this case.
*/
if (req->ops == &reqops_unit_attention) {
return;
}
if (req->dev->unit_attention.key == UNIT_ATTENTION) { if (req->dev->unit_attention.key == UNIT_ATTENTION) {
ua = &req->dev->unit_attention; ua = &req->dev->unit_attention;
} else if (req->bus->unit_attention.key == UNIT_ATTENTION) { } else if (req->bus->unit_attention.key == UNIT_ATTENTION) {
@ -836,13 +837,7 @@ static void scsi_clear_unit_attention(SCSIRequest *req)
return; return;
} }
/* if (ua->asc == SENSE_CODE(REPORTED_LUNS_CHANGED).asc &&
* If a REPORT LUNS command enters the enabled command state, [...]
* the device server shall clear any pending unit attention condition
* with an additional sense code of REPORTED LUNS DATA HAS CHANGED.
*/
if (req->cmd.buf[0] == REPORT_LUNS &&
ua->asc == SENSE_CODE(REPORTED_LUNS_CHANGED).asc &&
ua->ascq == SENSE_CODE(REPORTED_LUNS_CHANGED).ascq) { ua->ascq == SENSE_CODE(REPORTED_LUNS_CHANGED).ascq) {
*ua = SENSE_CODE(NO_SENSE); *ua = SENSE_CODE(NO_SENSE);
} }
@ -1528,13 +1523,6 @@ void scsi_req_complete(SCSIRequest *req, int status)
req->dev->sense_is_ua = false; req->dev->sense_is_ua = false;
} }
/*
* Unit attention state is now stored in the device's sense buffer
* if the HBA didn't do autosense. Clear the pending unit attention
* flags.
*/
scsi_clear_unit_attention(req);
scsi_req_ref(req); scsi_req_ref(req);
scsi_req_dequeue(req); scsi_req_dequeue(req);
req->bus->info->complete(req, req->residual); req->bus->info->complete(req, req->residual);