[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/30] scsi-disk: restruct emulation: START_STOP
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 21/30] scsi-disk: restruct emulation: START_STOP |
Date: |
Thu, 26 Nov 2009 15:34:07 +0100 |
Move START_STOP emulation from scsi_send_command() to
scsi_disk_emulate_command().
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/scsi-disk.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 06289c3..11e85f2 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -670,6 +670,12 @@ static int scsi_disk_emulate_command(SCSIRequest *req,
uint8_t *outbuf)
if (req->cmd.buf[1] & 3)
goto illegal_request;
break;
+ case START_STOP:
+ if (bdrv_get_type_hint(bdrv) == BDRV_TYPE_CDROM && (req->cmd.buf[4] &
2)) {
+ /* load/eject medium */
+ bdrv_eject(bdrv, !(req->cmd.buf[4] & 1));
+ }
+ break;
default:
goto illegal_request;
}
@@ -781,6 +787,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t
tag,
case RESERVE_10:
case RELEASE:
case RELEASE_10:
+ case START_STOP:
rc = scsi_disk_emulate_command(&r->req, outbuf);
if (rc > 0) {
r->iov.iov_len = rc;
@@ -790,13 +797,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t
tag,
return 0;
}
break;
- case START_STOP:
- DPRINTF("Start Stop Unit\n");
- if (bdrv_get_type_hint(s->qdev.dinfo->bdrv) == BDRV_TYPE_CDROM &&
- (buf[4] & 2))
- /* load/eject medium */
- bdrv_eject(s->qdev.dinfo->bdrv, !(buf[4] & 1));
- break;
case ALLOW_MEDIUM_REMOVAL:
DPRINTF("Prevent Allow Medium Removal (prevent = %d)\n", buf[4] & 3);
bdrv_set_locked(s->qdev.dinfo->bdrv, buf[4] & 1);
--
1.6.2.5
- [Qemu-devel] [PATCH 10/30] scsi: use command defines in scsi-disk.c, (continued)
- [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, 2009/11/26
- [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 <=
- [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
- [Qemu-devel] [PATCH 20/30] scsi-disk: restruct emulation: MODE_SENSE, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 29/30] scsi-disk: restruct emulation: VERIFY, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 24/30] scsi-disk: restruct emulation: SYNCHRONIZE_CACHE, Gerd Hoffmann, 2009/11/26