scsi: move type from SCSIGenericState to SCSIDevice

Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

hw/scsi-disk.c

@@ -938,6 +938,7 @@ static int scsi_disk_initfn(SCSIDevice *dev)
         s->cluster_size = 1;
     }
     s->qdev.blocksize = 512 * s->cluster_size;
+    s->qdev.type = TYPE_DISK;
     bdrv_get_geometry(s->dinfo->bdrv, &nb_sectors);
     nb_sectors /= s->cluster_size;
     if (nb_sectors)

hw/scsi-generic.c

@@ -59,7 +59,6 @@ struct SCSIGenericState
 {
     SCSIDevice qdev;
     DriveInfo *dinfo;
-    int type;
     int lun;
     int driver_status;
     uint8_t sensebuf[SCSI_SENSE_BUF_SIZE];
@@ -236,7 +235,7 @@ static void scsi_write_complete(void * opaque, int ret)
     }
 
     if (r->req.cmd.buf[0] == MODE_SELECT && r->req.cmd.buf[4] == 12 &&
-        s->type == TYPE_TAPE) {
+        s->qdev.type == TYPE_TAPE) {
         s->qdev.blocksize = (r->buf[9] << 16) | (r->buf[10] << 8) | r->buf[11];
         DPRINTF("block size %d\n", s->blocksize);
     }
@@ -459,7 +458,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
     SCSIBus *bus;
     int ret;
 
-    if (s->type == TYPE_TAPE) {
+    if (s->qdev.type == TYPE_TAPE) {
         if (scsi_stream_length(cmd, s->qdev.blocksize, &cmdlen, &len) == -1) {
             BADF("Unsupported command length, command %x\n", cmd[0]);
             return 0;
@@ -638,9 +637,9 @@ static int scsi_generic_initfn(SCSIDevice *dev)
     /* define device state */
     s->lun = scsiid.lun;
     DPRINTF("LUN %d\n", s->lun);
-    s->type = scsiid.scsi_type;
-    DPRINTF("device type %d\n", s->type);
-    if (s->type == TYPE_TAPE) {
+    s->qdev.type = scsiid.scsi_type;
+    DPRINTF("device type %d\n", s->qdev.type);
+    if (s->qdev.type == TYPE_TAPE) {
         s->qdev.blocksize = get_stream_blocksize(s->dinfo->bdrv);
         if (s->qdev.blocksize == -1)
             s->qdev.blocksize = 0;
@@ -648,7 +647,7 @@ static int scsi_generic_initfn(SCSIDevice *dev)
         s->qdev.blocksize = get_blocksize(s->dinfo->bdrv);
         /* removable media returns 0 if not present */
         if (s->qdev.blocksize <= 0) {
-            if (s->type == TYPE_ROM || s->type  == TYPE_WORM)
+            if (s->qdev.type == TYPE_ROM || s->qdev.type  == TYPE_WORM)
                 s->qdev.blocksize = 2048;
             else
                 s->qdev.blocksize = 512;

hw/scsi.h

@@ -38,6 +38,7 @@ struct SCSIDevice
     SCSIDeviceInfo *info;
     QTAILQ_HEAD(, SCSIRequest) requests;
     int blocksize;
+    int type;
 };
 
 /* cdrom.c */