[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/30] scsi-disk: restruct emulation: RESERVE+RELEAS
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 19/30] scsi-disk: restruct emulation: RESERVE+RELEASE |
Date: |
Thu, 26 Nov 2009 15:34:05 +0100 |
Move RESERVE+RELEASE emulation from scsi_send_command() to
scsi_disk_emulate_command().
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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 f94d513..c67712a 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) {
--
1.6.2.5
- [Qemu-devel] [PATCH 12/30] scsi: move sense to SCSIDevice, create SCSISense struct., (continued)
- [Qemu-devel] [PATCH 12/30] scsi: move sense to SCSIDevice, create SCSISense struct., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 11/30] scsi: add xfer mode, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 14/30] scsi: move status to SCSIRequest., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 10/30] scsi: use command defines in scsi-disk.c, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 06/30] scsi: move blocksize from SCSIGenericState to SCSIDevice, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 09/30] scsi: add request parsing helpers to common code., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 13/30] scsi: move dinfo to SCSIDevice, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 17/30] scsi-disk: restruct emulation: REQUEST_SENSE, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 07/30] scsi: add scsi-defs.h, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 15/30] scsi: add scsi_req_print(), Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 19/30] scsi-disk: restruct emulation: RESERVE+RELEASE,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 27/30] scsi-disk: restruct emulation: SERVICE_ACTION_IN, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 18/30] scsi-disk: restruct emulation: INQUIRY, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 21/30] scsi-disk: restruct emulation: START_STOP, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 26/30] scsi-disk: restruct emulation: GET_CONFIGURATION, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 30/30] scsi: add read/write 16 commands., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 16/30] scsi-disk: restruct emulation: core + TEST_UNIT_READY., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 22/30] scsi-disk: restruct emulation: ALLOW_MEDIUM_REMOVAL, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 28/30] scsi-disk: restruct emulation: REPORT_LUNS, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 23/30] scsi-disk: restruct emulation: READ_CAPACITY, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 25/30] scsi-disk: restruct emulation: READ_TOC, Gerd Hoffmann, 2009/11/26