diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-11-26 15:33:54 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 09:41:36 -0600 |
| commit | 913766563fbd6faa17635fd802e83383e0224289 (patch) | |
| tree | 0b0c08bb55c913f36023c55b699f7fd70ef7db23 | |
| parent | 0d65e1f856d6f5bd00cb90bcc394fbe95fe5d244 (diff) | |
scsi: move type from SCSIGenericState to SCSIDevice
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/scsi-disk.c | 1 | ||||
| -rw-r--r-- | hw/scsi-generic.c | 13 | ||||
| -rw-r--r-- | hw/scsi.h | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index b0eceaf094..6b5674b8ad 100644 --- a/hw/scsi-disk.c +++ b/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) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 3f4f7f951d..a66b83d3ef 100644 --- a/hw/scsi-generic.c +++ b/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; @@ -38,6 +38,7 @@ struct SCSIDevice SCSIDeviceInfo *info; QTAILQ_HEAD(, SCSIRequest) requests; int blocksize; + int type; }; /* cdrom.c */ |