scsi-disk: restruct emulation: SYNCHRONIZE_CACHE
authorGerd Hoffmann <kraxel@redhat.com>
Thu, 26 Nov 2009 14:34:10 +0000 (15:34 +0100)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 3 Dec 2009 15:41:39 +0000 (09:41 -0600)
Move SYNCHRONIZE_CACHE 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>
hw/scsi-disk.c

index 4f56a22..865c5db 100644 (file)
@@ -705,6 +705,9 @@ static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf)
         outbuf[7] = 0;
         buflen = 8;
        break;
+    case SYNCHRONIZE_CACHE:
+        bdrv_flush(bdrv);
+        break;
     default:
         goto illegal_request;
     }
@@ -819,6 +822,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
     case START_STOP:
     case ALLOW_MEDIUM_REMOVAL:
     case READ_CAPACITY:
+    case SYNCHRONIZE_CACHE:
         rc = scsi_disk_emulate_command(&r->req, outbuf);
         if (rc > 0) {
             r->iov.iov_len = rc;
@@ -847,10 +851,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
         r->sector_count = len * s->cluster_size;
         is_write = 1;
         break;
-    case SYNCHRONIZE_CACHE:
-        DPRINTF("Synchronise cache (sector %" PRId64 ", count %d)\n", lba, len);
-        bdrv_flush(s->qdev.dinfo->bdrv);
-        break;
     case READ_TOC:
         {
             int start_track, format, msf, toclen;