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

scsi-disk: restruct emulation: REQUEST_SENSE

Browse Source 
Move REQUEST_SENSE emulation from scsi_send_command() to
scsi_disk_emulate_command().

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-11-26 15:34:03 +01:00 committed by Anthony Liguori
parent aa5dbdc190
commit 51ad87c963
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/scsi-disk.c
View File

@ -316,6 +316,24 @@ static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf)
if (!bdrv_is_inserted(bdrv)) if (!bdrv_is_inserted(bdrv))
goto not_ready; goto not_ready;
break; break;
case REQUEST_SENSE:
if (req->cmd.xfer < 4)
goto illegal_request;
memset(outbuf, 0, 4);
buflen = 4;
if (req->dev->sense.key == NOT_READY && req->cmd.xfer >= 18) {
memset(outbuf, 0, 18);
buflen = 18;
outbuf[7] = 10;
/* asc 0x3a, ascq 0: Medium not present */
outbuf[12] = 0x3a;
outbuf[13] = 0;
}
outbuf[0] = 0xf0;
outbuf[1] = 0;
outbuf[2] = req->dev->sense.key;
scsi_dev_clear_sense(req->dev);
break;
default: default:
goto illegal_request; goto illegal_request;
} }
@ -419,6 +437,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
} }
switch (command) { switch (command) {
case TEST_UNIT_READY: case TEST_UNIT_READY:
case REQUEST_SENSE:
rc = scsi_disk_emulate_command(&r->req, outbuf); rc = scsi_disk_emulate_command(&r->req, outbuf);
if (rc > 0) { if (rc > 0) {
r->iov.iov_len = rc; r->iov.iov_len = rc;
@ -427,25 +446,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
scsi_remove_request(r); scsi_remove_request(r);
} }
return rc; return rc;
case REQUEST_SENSE:
DPRINTF("Request Sense (len %d)\n", len);
if (len < 4)
goto fail;
memset(outbuf, 0, 4);
r->iov.iov_len = 4;
if (s->qdev.sense.key == NOT_READY && len >= 18) {
memset(outbuf, 0, 18);
r->iov.iov_len = 18;
outbuf[7] = 10;
/* asc 0x3a, ascq 0: Medium not present */
outbuf[12] = 0x3a;
outbuf[13] = 0;
}
outbuf[0] = 0xf0;
outbuf[1] = 0;
outbuf[2] = s->qdev.sense.key;
scsi_dev_clear_sense(&s->qdev);
break;
case INQUIRY: case INQUIRY:
DPRINTF("Inquiry (len %d)\n", len); DPRINTF("Inquiry (len %d)\n", len);
if (buf[1] & 0x2) { if (buf[1] & 0x2) {