diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-11-26 15:34:05 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 09:41:39 -0600 |
| commit | 3d53ba18f5bae3208fe42d9c8fba9687394655d5 (patch) | |
| tree | ae67c11ddf08b72317b057319286847f8d4e7bf6 | |
| parent | 0b06c05979075cbf224724f5ac1a3f4d713ccdd8 (diff) | |
scsi-disk: restruct emulation: RESERVE+RELEASE
Move RESERVE+RELEASE 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>
| -rw-r--r-- | hw/scsi-disk.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index f94d51382d..c67712a015 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -473,6 +473,22 @@ static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf) if (buflen < 0) goto illegal_request; break; + case RESERVE: + if (req->cmd.buf[1] & 1) + goto illegal_request; + break; + case RESERVE_10: + if (req->cmd.buf[1] & 3) + goto illegal_request; + break; + case RELEASE: + if (req->cmd.buf[1] & 1) + goto illegal_request; + break; + case RELEASE_10: + if (req->cmd.buf[1] & 3) + goto illegal_request; + break; default: goto illegal_request; } @@ -578,6 +594,10 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, case TEST_UNIT_READY: case REQUEST_SENSE: case INQUIRY: + case RESERVE: + case RESERVE_10: + case RELEASE: + case RELEASE_10: rc = scsi_disk_emulate_command(&r->req, outbuf); if (rc > 0) { r->iov.iov_len = rc; @@ -587,16 +607,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, return 0; } break; - case RESERVE: - DPRINTF("Reserve(6)\n"); - if (buf[1] & 1) - goto fail; - break; - case RELEASE: - DPRINTF("Release(6)\n"); - if (buf[1] & 1) - goto fail; - break; case MODE_SENSE: case MODE_SENSE_10: { @@ -857,16 +867,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, outbuf[7] = 8; // CD-ROM r->iov.iov_len = 8; break; - case RESERVE_10: - DPRINTF("Reserve(10)\n"); - if (buf[1] & 3) - goto fail; - break; - case RELEASE_10: - DPRINTF("Release(10)\n"); - if (buf[1] & 3) - goto fail; - break; case 0x9e: /* Service Action In subcommands. */ if ((buf[1] & 31) == 0x10) { |