Patchwork [21/30] scsi-disk: restruct emulation: START_STOP

login
register
mail settings
Submitter Gerd Hoffmann
Date Nov. 26, 2009, 2:34 p.m.
Message ID <1259246056-5389-22-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/39545/
State New
Headers show

Comments

Gerd Hoffmann - Nov. 26, 2009, 2:34 p.m.
Move START_STOP emulation from scsi_send_command() to
scsi_disk_emulate_command().

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/scsi-disk.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

Patch

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);