From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAL8X-0000JU-Sy for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAL8S-0000Et-9p for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:13 -0500 Received: from [199.232.76.173] (port=58248 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAL8R-0000Ed-Rw for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40686) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAL8Q-0006wJ-AP for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:07 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAHAI5dk023537 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 05:18:05 -0500 From: Gerd Hoffmann Date: Tue, 17 Nov 2009 11:17:44 +0100 Message-Id: <1258453071-3496-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1258453071-3496-1-git-send-email-kraxel@redhat.com> References: <1258453071-3496-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 08/15] scsi: move type from SCSIGenericState to SCSIDevice List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/scsi-disk.c | 1 + hw/scsi-generic.c | 13 ++++++------- hw/scsi.h | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index a01a786..25f8eaa 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -957,6 +957,7 @@ static int scsi_disk_initfn(SCSIDevice *dev) s->cluster_size = 1; } s->qdev.blocksize = 512; + 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 31b2b7c..7c003b7 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]; @@ -258,7 +257,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); } @@ -481,7 +480,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; @@ -660,9 +659,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; @@ -670,7 +669,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; diff --git a/hw/scsi.h b/hw/scsi.h index bba88f3..1217bf7 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -38,6 +38,7 @@ struct SCSIDevice SCSIDeviceInfo *info; QTAILQ_HEAD(, SCSIRequest) requests; int blocksize; + int type; }; /* cdrom.c */ -- 1.6.2.5