mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: pass down REQUEST SENSE to the device when there is no stored sense

Browse Source 
This will let scsi-block/scsi-generic report progress on long
operations.

Reported-by: Thomas Schmitt <scdbackup@gmxbackup.net>
Tested-by: Thomas Schmitt <scdbackup@gmxbackup.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2011-11-14 14:31:51 +01:00 committed by Kevin Wolf
parent 0fd76ff40b
commit f3b338ef4a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/scsi-bus.c
View File

@ -9,8 +9,6 @@
static char *scsibus_get_fw_dev_path(DeviceState *dev); static char *scsibus_get_fw_dev_path(DeviceState *dev);
static int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf); static int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf);
static void scsi_req_dequeue(SCSIRequest *req); 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 = { static struct BusInfo scsi_bus_info = {
.name = "SCSI", .name = "SCSI",
@ -502,7 +500,7 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun,
hba_private); hba_private);
} else if (lun != d->lun || } else if (lun != d->lun ||
buf[0] == REPORT_LUNS || 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, req = scsi_req_alloc(&reqops_target_command, d, tag, lun,
hba_private); hba_private);
} else { } else {

8
hw/scsi-disk.c
View File

@ -1179,6 +1179,11 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r)
outbuf[7] = 0; outbuf[7] = 0;
buflen = 8; buflen = 8;
break; 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: case MECHANISM_STATUS:
buflen = scsi_emulate_mechanism_status(s, outbuf); buflen = scsi_emulate_mechanism_status(s, outbuf);
if (buflen < 0) { if (buflen < 0) {
@ -1313,6 +1318,7 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf)
case GET_EVENT_STATUS_NOTIFICATION: case GET_EVENT_STATUS_NOTIFICATION:
case MECHANISM_STATUS: case MECHANISM_STATUS:
case SERVICE_ACTION_IN_16: case SERVICE_ACTION_IN_16:
case REQUEST_SENSE:
case VERIFY_10: case VERIFY_10:
rc = scsi_disk_emulate_command(r); rc = scsi_disk_emulate_command(r);
if (rc < 0) { if (rc < 0) {
@ -1407,8 +1413,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf)
} }
break; break;
case REQUEST_SENSE:
abort();
default: default:
DPRINTF("Unknown SCSI command (%2.2x)\n", buf[0]); DPRINTF("Unknown SCSI command (%2.2x)\n", buf[0]);
scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE)); scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));

2
hw/scsi.h
View File

@ -179,6 +179,8 @@ extern const struct SCSISense sense_code_DEVICE_INTERNAL_RESET;
#define SENSE_CODE(x) sense_code_ ## x #define SENSE_CODE(x) sense_code_ ## x
int scsi_sense_valid(SCSISense sense); 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, SCSIRequest *scsi_req_alloc(const SCSIReqOps *reqops, SCSIDevice *d,
uint32_t tag, uint32_t lun, void *hba_private); uint32_t tag, uint32_t lun, void *hba_private);