From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IxMrq-0000lm-Vr for qemu-devel@nongnu.org; Wed, 28 Nov 2007 08:22:19 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IxMro-0000lR-Sb for qemu-devel@nongnu.org; Wed, 28 Nov 2007 08:22:17 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IxMro-0000lM-KC for qemu-devel@nongnu.org; Wed, 28 Nov 2007 08:22:16 -0500 Received: from ecfrec.frec.bull.fr ([129.183.4.8]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IxMrm-0001Nb-II for qemu-devel@nongnu.org; Wed, 28 Nov 2007 08:22:16 -0500 Received: from localhost (localhost [127.0.0.1]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id 483E419D9E3 for ; Wed, 28 Nov 2007 14:21:36 +0100 (CET) Received: from ecfrec.frec.bull.fr ([127.0.0.1]) by localhost (ecfrec.frec.bull.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 13295-08 for ; Wed, 28 Nov 2007 14:21:32 +0100 (CET) Received: from ecn002.frec.bull.fr (ecn002.frec.bull.fr [129.183.4.6]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id 970BF19D9F0 for ; Wed, 28 Nov 2007 14:21:29 +0100 (CET) In-Reply-To: <1196256214740@bull.net> Date: Wed, 28 Nov 2007 14:23:37 +0100 Message-Id: <11962562172906@bull.net> Mime-Version: 1.0 From: Laurent Vivier Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/3] SG support (Synchronous I/O) Reply-To: Laurent Vivier , qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org This patch allows to connect the virtual SCSI interface of Qemu to a real SCSI device of the host. Using the devices /dev/sg, it allows to send the SCSI command from the virtual SCSI interface to the real device. This patch uses synchronous SCSI I/O. block-raw.c has been modified to disable the "lseek()" when offset is les= s than 0 in raw_pread() and raw_pwrite() to be able to use them on /dev/sg devic= es. --- Makefile | 1=20 block-raw.c | 19 + block.c | 17 + block.h | 2=20 block_int.h | 4=20 hw/esp.c | 20 + hw/lsi53c895a.c | 22 +- hw/scsi-disk.c | 62 +++-- hw/scsi-disk.h | 29 +- hw/scsi-generic.c | 577 +++++++++++++++++++++++++++++++++++++++++++++++= +++++++ hw/usb-msd.c | 16 - 11 files changed, 704 insertions(+), 65 deletions(-) Index: qemu/block-raw.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/block-raw.c 2007-11-28 11:39:19.000000000 +0100 +++ qemu/block-raw.c 2007-11-28 13:12:02.000000000 +0100 @@ -52,6 +52,7 @@ #include #include #include +#include #endif #ifdef __FreeBSD__ #include @@ -148,7 +149,7 @@ static int raw_pread(BlockDriverState *b if (ret < 0) return ret; =20 - if (lseek(s->fd, offset, SEEK_SET) =3D=3D (off_t)-1) { + if (offset >=3D 0 && lseek(s->fd, offset, SEEK_SET) =3D=3D (off_t)-1= ) { ++(s->lseek_err_cnt); if(s->lseek_err_cnt <=3D 10) { DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %" PRId64 ", %p, %d) [%"= PRId64 @@ -201,7 +202,7 @@ static int raw_pwrite(BlockDriverState * if (ret < 0) return ret; =20 - if (lseek(s->fd, offset, SEEK_SET) =3D=3D (off_t)-1) { + if (offset >=3D 0 && lseek(s->fd, offset, SEEK_SET) =3D=3D (off_t)-1= ) { ++(s->lseek_err_cnt); if(s->lseek_err_cnt) { DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %" PRId64 ", %p, %d) [%= " @@ -672,6 +673,8 @@ static int hdev_open(BlockDriverState *b s->fd_open_flags =3D open_flags; /* open will not fail even if no floppy is inserted */ open_flags |=3D O_NONBLOCK; + } else if (strstart(filename, "/dev/sg", NULL)) { + bs->sg =3D 1; } #endif fd =3D open(filename, open_flags, 0644); @@ -851,6 +854,12 @@ static int raw_set_locked(BlockDriverSta return 0; } =20 +static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *= buf) +{ + BDRVRawState *s =3D bs->opaque; + + return ioctl(s->fd, req, buf); +} #else =20 static int raw_is_inserted(BlockDriverState *bs) @@ -873,6 +882,10 @@ static int raw_set_locked(BlockDriverSta return -ENOTSUP; } =20 +static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *= buf) +{ + return -ENOTSUP; +} #endif /* !linux */ =20 BlockDriver bdrv_host_device =3D { @@ -899,6 +912,8 @@ BlockDriver bdrv_host_device =3D { .bdrv_media_changed =3D raw_media_changed, .bdrv_eject =3D raw_eject, .bdrv_set_locked =3D raw_set_locked, + /* generic scsi device */ + .bdrv_ioctl =3D raw_ioctl, }; =20 #else /* _WIN32 */ Index: qemu/block.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/block.c 2007-11-28 11:39:19.000000000 +0100 +++ qemu/block.c 2007-11-28 11:44:37.000000000 +0100 @@ -303,7 +303,6 @@ int bdrv_file_open(BlockDriverState **pb { BlockDriverState *bs; int ret; - bs =3D bdrv_new(""); if (!bs) return -ENOMEM; @@ -780,6 +779,11 @@ int bdrv_is_read_only(BlockDriverState * return bs->read_only; } =20 +int bdrv_is_sg(BlockDriverState *bs) +{ + return bs->sg; +} + /* XXX: no longer used */ void bdrv_set_change_cb(BlockDriverState *bs, void (*change_cb)(void *opaque), void *opaque) @@ -1352,3 +1356,14 @@ void bdrv_set_locked(BlockDriverState *b drv->bdrv_set_locked(bs, locked); } } + +/* needed for generic scsi interface */ + +int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) +{ + BlockDriver *drv =3D bs->drv; + + if (drv && drv->bdrv_ioctl) + return drv->bdrv_ioctl(bs, req, buf); + return -ENOTSUP; +} Index: qemu/block.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/block.h 2007-11-28 11:39:19.000000000 +0100 +++ qemu/block.h 2007-11-28 11:44:37.000000000 +0100 @@ -117,6 +117,7 @@ int bdrv_get_type_hint(BlockDriverState=20 int bdrv_get_translation_hint(BlockDriverState *bs); int bdrv_is_removable(BlockDriverState *bs); int bdrv_is_read_only(BlockDriverState *bs); +int bdrv_is_sg(BlockDriverState *bs); int bdrv_is_inserted(BlockDriverState *bs); int bdrv_media_changed(BlockDriverState *bs); int bdrv_is_locked(BlockDriverState *bs); @@ -146,6 +147,7 @@ int bdrv_snapshot_delete(BlockDriverStat int bdrv_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_info); char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn); +int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf); =20 char *get_human_readable_size(char *buf, int buf_size, int64_t size); int path_is_absolute(const char *path); Index: qemu/block_int.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/block_int.h 2007-11-28 11:39:19.000000000 +0100 +++ qemu/block_int.h 2007-11-28 11:44:37.000000000 +0100 @@ -82,6 +82,9 @@ struct BlockDriver { int (*bdrv_eject)(BlockDriverState *bs, int eject_flag); int (*bdrv_set_locked)(BlockDriverState *bs, int locked); =20 + /* to control generic scsi devices */ + int (*bdrv_ioctl)(BlockDriverState *bs, unsigned long int req, char = *buf); + BlockDriverAIOCB *free_aiocb; struct BlockDriver *next; }; @@ -93,6 +96,7 @@ struct BlockDriverState { int removable; /* if true, the media can be removed */ int locked; /* if true, the media cannot temporarily be ejected *= / int encrypted; /* if true, the media is encrypted */ + int sg; /* if true, the device is a /dev/sg* */ /* event callback when inserting/removing */ void (*change_cb)(void *opaque); void *change_opaque; Index: qemu/hw/scsi-disk.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/scsi-disk.c 2007-11-28 11:39:19.000000000 +0100 +++ qemu/hw/scsi-disk.c 2007-11-28 11:44:37.000000000 +0100 @@ -37,7 +37,7 @@ do { fprintf(stderr, "scsi-disk: " fmt , #define SCSI_DMA_BUF_SIZE 65536 =20 typedef struct SCSIRequest { - SCSIDevice *dev; + SCSIDeviceState *dev; uint32_t tag; /* ??? We should probably keep track of whether the data trasfer is a read or a write. Currently we rely on the host getting it righ= t. */ @@ -51,7 +51,7 @@ typedef struct SCSIRequest { struct SCSIRequest *next; } SCSIRequest; =20 -struct SCSIDevice +struct SCSIDeviceState { BlockDriverState *bdrv; SCSIRequest *requests; @@ -69,7 +69,7 @@ struct SCSIDevice /* Global pool of SCSIRequest structures. */ static SCSIRequest *free_requests =3D NULL; =20 -static SCSIRequest *scsi_new_request(SCSIDevice *s, uint32_t tag) +static SCSIRequest *scsi_new_request(SCSIDeviceState *s, uint32_t tag) { SCSIRequest *r; =20 @@ -93,7 +93,7 @@ static SCSIRequest *scsi_new_request(SCS static void scsi_remove_request(SCSIRequest *r) { SCSIRequest *last; - SCSIDevice *s =3D r->dev; + SCSIDeviceState *s =3D r->dev; =20 if (s->requests =3D=3D r) { s->requests =3D r->next; @@ -111,7 +111,7 @@ static void scsi_remove_request(SCSIRequ free_requests =3D r; } =20 -static SCSIRequest *scsi_find_request(SCSIDevice *s, uint32_t tag) +static SCSIRequest *scsi_find_request(SCSIDeviceState *s, uint32_t tag) { SCSIRequest *r; =20 @@ -125,7 +125,7 @@ static SCSIRequest *scsi_find_request(SC /* Helper function for command completion. */ static void scsi_command_complete(SCSIRequest *r, int sense) { - SCSIDevice *s =3D r->dev; + SCSIDeviceState *s =3D r->dev; uint32_t tag; DPRINTF("Command complete tag=3D0x%x sense=3D%d\n", r->tag, sense); s->sense =3D sense; @@ -135,8 +135,9 @@ static void scsi_command_complete(SCSIRe } =20 /* Cancel a pending data transfer. */ -void scsi_cancel_io(SCSIDevice *s, uint32_t tag) +static void scsi_cancel_io(SCSIDevice *d, uint32_t tag) { + SCSIDeviceState *s =3D d->state; SCSIRequest *r; DPRINTF("Cancel tag=3D0x%x\n", tag); r =3D scsi_find_request(s, tag); @@ -151,7 +152,7 @@ void scsi_cancel_io(SCSIDevice *s, uint3 static void scsi_read_complete(void * opaque, int ret) { SCSIRequest *r =3D (SCSIRequest *)opaque; - SCSIDevice *s =3D r->dev; + SCSIDeviceState *s =3D r->dev; =20 if (ret) { DPRINTF("IO error\n"); @@ -164,8 +165,9 @@ static void scsi_read_complete(void * op } =20 /* Read more data from scsi device into buffer. */ -void scsi_read_data(SCSIDevice *s, uint32_t tag) +static void scsi_read_data(SCSIDevice *d, uint32_t tag) { + SCSIDeviceState *s =3D d->state; SCSIRequest *r; uint32_t n; =20 @@ -204,7 +206,7 @@ void scsi_read_data(SCSIDevice *s, uint3 static void scsi_write_complete(void * opaque, int ret) { SCSIRequest *r =3D (SCSIRequest *)opaque; - SCSIDevice *s =3D r->dev; + SCSIDeviceState *s =3D r->dev; uint32_t len; =20 if (ret) { @@ -228,8 +230,9 @@ static void scsi_write_complete(void * o =20 /* Write data to a scsi device. Returns nonzero on failure. The transfer may complete asynchronously. */ -int scsi_write_data(SCSIDevice *s, uint32_t tag) +static int scsi_write_data(SCSIDevice *d, uint32_t tag) { + SCSIDeviceState *s =3D d->state; SCSIRequest *r; uint32_t n; =20 @@ -259,8 +262,9 @@ int scsi_write_data(SCSIDevice *s, uint3 } =20 /* Return a pointer to the data buffer. */ -uint8_t *scsi_get_buf(SCSIDevice *s, uint32_t tag) +static uint8_t *scsi_get_buf(SCSIDevice *d, uint32_t tag) { + SCSIDeviceState *s =3D d->state; SCSIRequest *r; =20 r =3D scsi_find_request(s, tag); @@ -276,8 +280,10 @@ uint8_t *scsi_get_buf(SCSIDevice *s, uin (eg. disk reads), negative for transfers to the device (eg. disk writ= es), and zero if the command does not transfer any data. */ =20 -int32_t scsi_send_command(SCSIDevice *s, uint32_t tag, uint8_t *buf, int= lun) +static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, + uint8_t *buf, int lun) { + SCSIDeviceState *s =3D d->state; int64_t nb_sectors; uint32_t lba; uint32_t len; @@ -291,7 +297,7 @@ int32_t scsi_send_command(SCSIDevice *s, r =3D scsi_find_request(s, tag); if (r) { BADF("Tag 0x%x already in use\n", tag); - scsi_cancel_io(s, tag); + scsi_cancel_io(d, tag); } /* ??? Tags are not unique for different luns. We only implement a single lun, so this should not matter. */ @@ -576,19 +582,19 @@ int32_t scsi_send_command(SCSIDevice *s, } } =20 -void scsi_disk_destroy(SCSIDevice *s) +static void scsi_destroy(SCSIDevice *d) { - qemu_free(s); + qemu_free(d->state); + qemu_free(d); } =20 -SCSIDevice *scsi_disk_init(BlockDriverState *bdrv, - int tcq, - scsi_completionfn completion, - void *opaque) +SCSIDevice *scsi_disk_init(BlockDriverState *bdrv, int tcq, + scsi_completionfn completion, void *opaque) { - SCSIDevice *s; + SCSIDevice *d; + SCSIDeviceState *s; =20 - s =3D (SCSIDevice *)qemu_mallocz(sizeof(SCSIDevice)); + s =3D (SCSIDeviceState *)qemu_mallocz(sizeof(SCSIDeviceState)); s->bdrv =3D bdrv; s->tcq =3D tcq; s->completion =3D completion; @@ -599,6 +605,14 @@ SCSIDevice *scsi_disk_init(BlockDriverSt s->cluster_size =3D 1; } =20 - return s; -} + d =3D (SCSIDevice *)qemu_mallocz(sizeof(SCSIDevice)); + d->state =3D s; + d->destroy =3D scsi_destroy; + d->send_command =3D scsi_send_command; + d->read_data =3D scsi_read_data; + d->write_data =3D scsi_write_data; + d->cancel_io =3D scsi_cancel_io; + d->get_buf =3D scsi_get_buf; =20 + return d; +} Index: qemu/hw/esp.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/esp.c 2007-11-28 11:44:31.000000000 +0100 +++ qemu/hw/esp.c 2007-11-28 11:44:37.000000000 +0100 @@ -120,7 +120,7 @@ static int get_cmd(ESPState *s, uint8_t=20 =20 if (s->current_dev) { /* Started a new command before the old one finished. Cancel it= . */ - scsi_cancel_io(s->current_dev, 0); + s->current_dev->cancel_io(s->current_dev, 0); s->async_len =3D 0; } =20 @@ -143,7 +143,7 @@ static void do_cmd(ESPState *s, uint8_t=20 =20 DPRINTF("do_cmd: busid 0x%x\n", buf[0]); lun =3D buf[0] & 7; - datalen =3D scsi_send_command(s->current_dev, 0, &buf[1], lun); + datalen =3D s->current_dev->send_command(s->current_dev, 0, &buf[1],= lun); s->ti_size =3D datalen; if (datalen !=3D 0) { s->rregs[4] =3D STAT_IN | STAT_TC; @@ -151,10 +151,10 @@ static void do_cmd(ESPState *s, uint8_t=20 s->dma_counter =3D 0; if (datalen > 0) { s->rregs[4] |=3D STAT_DI; - scsi_read_data(s->current_dev, 0); + s->current_dev->read_data(s->current_dev, 0); } else { s->rregs[4] |=3D STAT_DO; - scsi_write_data(s->current_dev, 0); + s->current_dev->write_data(s->current_dev, 0); } } s->rregs[5] =3D INTR_BS | INTR_FC; @@ -253,9 +253,9 @@ static void esp_do_dma(ESPState *s) if (s->async_len =3D=3D 0) { if (to_device) { // ti_size is negative - scsi_write_data(s->current_dev, 0); + s->current_dev->write_data(s->current_dev, 0); } else { - scsi_read_data(s->current_dev, 0); + s->current_dev->read_data(s->current_dev, 0); /* If there is still data to be read from the device then complete the DMA operation immeriately. Otherwise defer until the scsi layer has completed. */ @@ -290,7 +290,7 @@ static void esp_command_complete(void *o } else { DPRINTF("transfer %d/%d\n", s->dma_left, s->ti_size); s->async_len =3D arg; - s->async_buf =3D scsi_get_buf(s->current_dev, 0); + s->async_buf =3D s->current_dev->get_buf(s->current_dev, 0); if (s->dma_left) { esp_do_dma(s); } else if (s->dma_counter !=3D 0 && s->ti_size <=3D 0) { @@ -569,11 +569,13 @@ void esp_scsi_attach(void *opaque, Block } if (s->scsi_dev[id]) { DPRINTF("Destroying device %d\n", id); - scsi_disk_destroy(s->scsi_dev[id]); + s->scsi_dev[id]->destroy(s->scsi_dev[id]); } DPRINTF("Attaching block device %d\n", id); /* Command queueing is not implemented. */ - s->scsi_dev[id] =3D scsi_disk_init(bd, 0, esp_command_complete, s); + s->scsi_dev[id] =3D scsi_generic_init(bd, 0, esp_command_complete, s= ); + if (s->scsi_dev[id] =3D=3D NULL) + s->scsi_dev[id] =3D scsi_disk_init(bd, 0, esp_command_complete, = s); } =20 void *esp_init(target_phys_addr_t espaddr, Index: qemu/hw/lsi53c895a.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/lsi53c895a.c 2007-11-28 11:44:31.000000000 +0100 +++ qemu/hw/lsi53c895a.c 2007-11-28 13:12:02.000000000 +0100 @@ -465,7 +465,8 @@ static void lsi_do_dma(LSIState *s, int=20 s->dbc -=3D count; =20 if (s->dma_buf =3D=3D NULL) { - s->dma_buf =3D scsi_get_buf(s->current_dev, s->current_tag); + s->dma_buf =3D s->current_dev->get_buf(s->current_dev, + s->current_tag); } =20 /* ??? Set SFBR to first data byte. */ @@ -479,10 +480,10 @@ static void lsi_do_dma(LSIState *s, int=20 s->dma_buf =3D NULL; if (out) { /* Write the data. */ - scsi_write_data(s->current_dev, s->current_tag); + s->current_dev->write_data(s->current_dev, s->current_tag); } else { /* Request any remaining data. */ - scsi_read_data(s->current_dev, s->current_tag); + s->current_dev->read_data(s->current_dev, s->current_tag); } } else { s->dma_buf +=3D count; @@ -631,13 +632,14 @@ static void lsi_do_command(LSIState *s) s->dbc =3D 16; cpu_physical_memory_read(s->dnad, buf, s->dbc); s->sfbr =3D buf[0]; - n =3D scsi_send_command(s->current_dev, s->current_tag, buf, s->curr= ent_lun); + n =3D s->current_dev->send_command(s->current_dev, s->current_tag, b= uf, + s->current_lun); if (n > 0) { lsi_set_phase(s, PHASE_DI); - scsi_read_data(s->current_dev, s->current_tag); + s->current_dev->read_data(s->current_dev, s->current_tag); } else if (n < 0) { lsi_set_phase(s, PHASE_DO); - scsi_write_data(s->current_dev, s->current_tag); + s->current_dev->write_data(s->current_dev, s->current_tag); } if (n && s->current_dma_len =3D=3D 0) { /* Command did not complete immediately so disconnect. */ @@ -1268,6 +1270,8 @@ static uint8_t lsi_reg_readb(LSIState *s return s->ctest4; case 0x22: /* CTEST5 */ return s->ctest5; + case 0x23: /* CTEST6 */ + return 0; case 0x24: /* DBC[0:7] */ return s->dbc & 0xff; case 0x25: /* DBC[8:15] */ @@ -1822,10 +1826,12 @@ void lsi_scsi_attach(void *opaque, Block } if (s->scsi_dev[id]) { DPRINTF("Destroying device %d\n", id); - scsi_disk_destroy(s->scsi_dev[id]); + s->scsi_dev[id]->destroy(s->scsi_dev[id]); } DPRINTF("Attaching block device %d\n", id); - s->scsi_dev[id] =3D scsi_disk_init(bd, 1, lsi_command_complete, s); + s->scsi_dev[id] =3D scsi_generic_init(bd, 1, lsi_command_complete, s= ); + if (s->scsi_dev[id] =3D=3D NULL) + s->scsi_dev[id] =3D scsi_disk_init(bd, 1, lsi_command_complete, = s); } =20 void *lsi_scsi_init(PCIBus *bus, int devfn) Index: qemu/hw/usb-msd.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/usb-msd.c 2007-11-28 11:39:19.000000000 +0100 +++ qemu/hw/usb-msd.c 2007-11-28 11:44:37.000000000 +0100 @@ -149,9 +149,9 @@ static void usb_msd_copy_data(MSDState * s->data_len -=3D len; if (s->scsi_len =3D=3D 0) { if (s->mode =3D=3D USB_MSDM_DATAIN) { - scsi_read_data(s->scsi_dev, s->tag); + s->scsi_dev->read_data(s->scsi_dev, s->tag); } else if (s->mode =3D=3D USB_MSDM_DATAOUT) { - scsi_write_data(s->scsi_dev, s->tag); + s->scsi_dev->write_data(s->scsi_dev, s->tag); } } } @@ -204,7 +204,7 @@ static void usb_msd_command_complete(voi return; } s->scsi_len =3D arg; - s->scsi_buf =3D scsi_get_buf(s->scsi_dev, tag); + s->scsi_buf =3D s->scsi_dev->get_buf(s->scsi_dev, tag); if (p) { usb_msd_copy_data(s); if (s->usb_len =3D=3D 0) { @@ -342,7 +342,7 @@ static int usb_msd_handle_control(USBDev static void usb_msd_cancel_io(USBPacket *p, void *opaque) { MSDState *s =3D opaque; - scsi_cancel_io(s->scsi_dev, s->tag); + s->scsi_dev->cancel_io(s->scsi_dev, s->tag); s->packet =3D NULL; s->scsi_len =3D 0; } @@ -390,14 +390,14 @@ static int usb_msd_handle_data(USBDevice DPRINTF("Command tag 0x%x flags %08x len %d data %d\n", s->tag, cbw.flags, cbw.cmd_len, s->data_len); s->residue =3D 0; - scsi_send_command(s->scsi_dev, s->tag, cbw.cmd, 0); + s->scsi_dev->send_command(s->scsi_dev, s->tag, cbw.cmd, 0); /* ??? Should check that USB and SCSI data transfer directions match. */ if (s->residue =3D=3D 0) { if (s->mode =3D=3D USB_MSDM_DATAIN) { - scsi_read_data(s->scsi_dev, s->tag); + s->scsi_dev->read_data(s->scsi_dev, s->tag); } else if (s->mode =3D=3D USB_MSDM_DATAOUT) { - scsi_write_data(s->scsi_dev, s->tag); + s->scsi_dev->write_data(s->scsi_dev, s->tag); } } ret =3D len; @@ -508,7 +508,7 @@ static void usb_msd_handle_destroy(USBDe { MSDState *s =3D (MSDState *)dev; =20 - scsi_disk_destroy(s->scsi_dev); + s->scsi_dev->destroy(s->scsi_dev); bdrv_delete(s->bs); qemu_free(s); } Index: qemu/hw/scsi-generic.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ qemu/hw/scsi-generic.c 2007-11-28 13:12:12.000000000 +0100 @@ -0,0 +1,577 @@ +/* + * Generic SCSI Device support + * + * Copyright (c) 2007 Bull S.A.S. + * Based on code by Paul Brook + * Based on code by Fabrice Bellard + * + * Written by Laurent Vivier + * + * This code is licenced under the LGPL. + * + */ + +#include "qemu-common.h" +#include "block.h" +#include "scsi-disk.h" + +#ifndef __linux__ + +SCSIDevice *scsi_generic_init(BlockDriverState *bdrv, int tcq, + scsi_completionfn completion, void *opaque= ) +{ + return NULL; +} + +#else /* __linux__ */ + +//#define DEBUG_SCSI + +#ifdef DEBUG_SCSI +#define DPRINTF(fmt, args...) \ +do { printf("scsi-generic: " fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) do {} while(0) +#endif + +#define BADF(fmt, args...) \ +do { fprintf(stderr, "scsi-generic: " fmt , ##args); } while (0) + +#include +#include +#include +#include +#include +#include + +#define LOAD_UNLOAD 0xa6 +#define SET_CD_SPEED 0xbb + +#define SCSI_CMD_BUF_SIZE 16 +#define SCSI_SENSE_BUF_SIZE 32 + +#define SG_ERR_DRIVER_SENSE 0x08 + +typedef struct SCSIRequest { + struct SCSIRequest *next; + SCSIDeviceState *dev; + uint32_t tag; + uint8_t cmd[SCSI_CMD_BUF_SIZE]; + int cmdlen; + uint8_t *buf; + int buflen; + int len; + int driver_status; + uint8_t sensebuf[SCSI_SENSE_BUF_SIZE]; +} SCSIRequest; + +struct SCSIDeviceState +{ + SCSIRequest *requests; + BlockDriverState *bdrv; + int blocksize; + int lun; + scsi_completionfn completion; + void *opaque; +}; + +/* Global pool of SCSIRequest structures. */ +static SCSIRequest *free_requests =3D NULL; + +static SCSIRequest *scsi_new_request(SCSIDeviceState *s, uint32_t tag) +{ + SCSIRequest *r; + + if (free_requests) { + r =3D free_requests; + free_requests =3D r->next; + } else { + r =3D qemu_malloc(sizeof(SCSIRequest)); + r->buf =3D NULL; + r->buflen =3D 0; + } + r->dev =3D s; + r->tag =3D tag; + memset(r->cmd, 0, sizeof(r->cmd)); + memset(r->sensebuf, 0, sizeof(r->sensebuf)); + r->cmdlen =3D 0; + r->len =3D 0; + + /* link */ + + r->next =3D s->requests; + s->requests =3D r; + return r; +} + +static void scsi_remove_request(SCSIRequest *r) +{ + SCSIRequest *last; + SCSIDeviceState *s =3D r->dev; + + if (s->requests =3D=3D r) { + s->requests =3D r->next; + } else { + last =3D s->requests; + while (last && last->next !=3D r) + last =3D last->next; + if (last) { + last->next =3D r->next; + } else { + BADF("Orphaned request\n"); + } + } + r->next =3D free_requests; + free_requests =3D r; +} + +static SCSIRequest *scsi_find_request(SCSIDeviceState *s, uint32_t tag) +{ + SCSIRequest *r; + + r =3D s->requests; + while (r && r->tag !=3D tag) + r =3D r->next; + + return r; +} + +static int scsi_get_sense(SCSIRequest *r) +{ + if ((r->driver_status & SG_ERR_DRIVER_SENSE) =3D=3D 0) + return NO_SENSE; + return r->sensebuf[2] & 0x0f; +} + +/* Helper function for command completion. */ +static void scsi_command_complete(SCSIRequest *r, int sense) +{ + SCSIDeviceState *s =3D r->dev; + uint32_t tag; + DPRINTF("Command complete 0x%p tag=3D0x%x sense=3D%d\n", r, r->tag, = sense); + tag =3D r->tag; + scsi_remove_request(r); + s->completion(s->opaque, SCSI_REASON_DONE, tag, sense); +} + +/* Cancel a pending data transfer. */ +static void scsi_cancel_io(SCSIDevice *d, uint32_t tag) +{ + DPRINTF("scsi_cancel_io 0x%x\n", tag); + SCSIDeviceState *s =3D d->state; + SCSIRequest *r; + DPRINTF("Cancel tag=3D0x%x\n", tag); + r =3D scsi_find_request(s, tag); + if (r) { + scsi_remove_request(r); + } +} + +static int execute_command(BlockDriverState *bdrv, uint8_t *cmdbuf, int = cmdlen, + uint8_t *outbuf, uint32_t outlen, + uint8_t *sensebuf, int senselen, + int direction, int *len) +{ + sg_io_hdr_t io_header; + int ret; + + memset(&io_header, 0, sizeof(io_header)); + io_header.interface_id =3D 'S'; + io_header.dxfer_direction =3D direction; + io_header.dxfer_len =3D outlen; + io_header.dxferp =3D outbuf; + io_header.cmdp =3D cmdbuf; + io_header.cmd_len =3D cmdlen; + io_header.mx_sb_len =3D senselen; + io_header.sbp =3D sensebuf; + io_header.timeout =3D 6000; /* XXX */ + + ret =3D bdrv_pwrite(bdrv, -1, &io_header, sizeof(io_header)); + if (ret =3D=3D -1) { + BADF("execute_command: write failed ! (%d)\n", errno); + return -1; + } + while ((ret =3D bdrv_pread(bdrv, -1, &io_header, sizeof(io_header)))= =3D=3D -1 && + errno =3D=3D EINTR); + + if (ret =3D=3D -1) { + BADF("execute_command: read failed !\n"); + return -1; + } + + if (len !=3D NULL) + *len =3D io_header.dxfer_len - io_header.resid; + + return io_header.driver_status; +} + +/* Read more data from scsi device into buffer. */ +static void scsi_read_data(SCSIDevice *d, uint32_t tag) +{ + SCSIDeviceState *s =3D d->state; + SCSIRequest *r; + int len; + + DPRINTF("scsi_read_data 0x%x\n", tag); + r =3D scsi_find_request(s, tag); + if (!r) { + BADF("Bad read tag 0x%x\n", tag); + /* ??? This is the wrong error. */ + scsi_command_complete(r, HARDWARE_ERROR); + return; + } + + if (r->len =3D=3D -1) { + scsi_command_complete(r, scsi_get_sense(r)); + return; + } + + len =3D r->len; + r->len =3D -1; + s->completion(s->opaque, SCSI_REASON_DATA, r->tag, len); +} + +/* Write data to a scsi device. Returns nonzero on failure. + The transfer may complete asynchronously. */ +static int scsi_write_data(SCSIDevice *d, uint32_t tag) +{ + SCSIDeviceState *s =3D d->state; + SCSIRequest *r; + int ret; + + DPRINTF("scsi_write_data 0x%x\n", tag); + r =3D scsi_find_request(s, tag); + if (!r) { + BADF("Bad write tag 0x%x\n", tag); + /* ??? This is the wrong error. */ + scsi_command_complete(r, HARDWARE_ERROR); + return 0; + } + + if (r->len =3D=3D 0) { + r->len =3D r->buflen; + s->completion(s->opaque, SCSI_REASON_DATA, r->tag, r->len); + return 0; + } + + ret =3D execute_command(s->bdrv, r->cmd, r->cmdlen, r->buf, r->len, + r->sensebuf, sizeof(r->sensebuf), + SG_DXFER_TO_DEV, NULL); + if (ret =3D=3D -1) { + scsi_command_complete(r, HARDWARE_ERROR); + return 1; + } + r->driver_status =3D ret; + scsi_command_complete(r, scsi_get_sense(r)); + + return 0; +} + +/* Return a pointer to the data buffer. */ +static uint8_t *scsi_get_buf(SCSIDevice *d, uint32_t tag) +{ + SCSIDeviceState *s =3D d->state; + SCSIRequest *r; + DPRINTF("scsi_get_buf 0x%x\n", tag); + r =3D scsi_find_request(s, tag); + if (!r) { + BADF("Bad buffer tag 0x%x\n", tag); + return NULL; + } + return r->buf; +} + +static int scsi_length(uint8_t *cmd, int blocksize, int *cmdlen, uint32_= t *len) +{ + switch (cmd[0] >> 5) { + case 0: + *len =3D cmd[4]; + *cmdlen =3D 6; + break; + case 1: + case 2: + *len =3D cmd[8] | (cmd[7] << 8); + *cmdlen =3D 10; + break; + case 4: + *len =3D cmd[13] | (cmd[12] << 8) | (cmd[11] << 16) | (cmd[10] <= < 24); + *cmdlen =3D 16; + break; + case 5: + *len =3D cmd[9] | (cmd[8] << 8) | (cmd[7] << 16) | (cmd[6] << 24= ); + *cmdlen =3D 12; + break; + default: + return -1; + } + + switch(cmd[0]) { + case TEST_UNIT_READY: + case REZERO_UNIT: + case START_STOP: + case SEEK_6: + case WRITE_FILEMARKS: + case SPACE: + case ERASE: + case ALLOW_MEDIUM_REMOVAL: + case VERIFY: + case SEEK_10: + case SYNCHRONIZE_CACHE: + case LOCK_UNLOCK_CACHE: + case LOAD_UNLOAD: + case SET_CD_SPEED: + case SET_LIMITS: + case WRITE_LONG: + case MOVE_MEDIUM: + case UPDATE_BLOCK: + *len =3D 0; + break; + case MODE_SENSE: + break; + case WRITE_SAME: + *len =3D 1; + break; + case READ_CAPACITY: + *len =3D 8; + break; + case READ_BLOCK_LIMITS: + *len =3D 6; + break; + case READ_POSITION: + *len =3D 20; + break; + case SEND_VOLUME_TAG: + *len *=3D 40; + break; + case MEDIUM_SCAN: + *len *=3D 8; + break; + case WRITE_VERIFY: + case WRITE_6: + case WRITE_10: + case WRITE_12: + case WRITE_VERIFY_12: + *len *=3D blocksize; + break; + case READ_6: + case READ_REVERSE: + case RECOVER_BUFFERED_DATA: + case READ_10: + case READ_12: + *len *=3D blocksize; + break; + } + return 0; +} + +static int is_write(int command) +{ + switch (command) { + case COPY: + case COPY_VERIFY: + case COMPARE: + case CHANGE_DEFINITION: + case LOG_SELECT: + case MODE_SELECT: + case MODE_SELECT_10: + case SEND_DIAGNOSTIC: + case WRITE_BUFFER: + case FORMAT_UNIT: + case REASSIGN_BLOCKS: + case RESERVE: + case SEARCH_EQUAL: + case SEARCH_HIGH: + case SEARCH_LOW: + case WRITE_6: + case WRITE_10: + case WRITE_VERIFY: + case UPDATE_BLOCK: + case WRITE_LONG: + case WRITE_SAME: + case SEARCH_HIGH_12: + case SEARCH_EQUAL_12: + case SEARCH_LOW_12: + case WRITE_12: + case WRITE_VERIFY_12: + case SET_WINDOW: + case MEDIUM_SCAN: + case SEND_VOLUME_TAG: + case WRITE_LONG_2: + return 1; + } + return 0; +} + +/* Execute a scsi command. Returns the length of the data expected by t= he + command. This will be Positive for data transfers from the device + (eg. disk reads), negative for transfers to the device (eg. disk writ= es), + and zero if the command does not transfer any data. */ + +static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, + uint8_t *cmd, int lun) +{ + SCSIDeviceState *s =3D d->state; + uint32_t len; + int cmdlen; + SCSIRequest *r; + int ret; + + r =3D scsi_find_request(s, tag); + if (r) { + BADF("Tag 0x%x already in use %p\n", tag, r); + scsi_cancel_io(d, tag); + } + r =3D scsi_new_request(s, tag); + + /* ??? Tags are not unique for different luns. We only implement a + single lun, so this should not matter. */ + + if (lun !=3D s->lun || (cmd[1] >> 5) !=3D s->lun) { + DPRINTF("Unimplemented LUN %d\n", lun ? lun : cmd[1] >> 5); + scsi_command_complete(r, ILLEGAL_REQUEST); + return 0; + } + + if (scsi_length(cmd, s->blocksize, &cmdlen, &len) =3D=3D -1) { + BADF("Unsupported command length, command %x\n", cmd[0]); + return 0; + } + + DPRINTF("Command: lun=3D%d tag=3D0x%x data=3D0x%02x len %d\n", lun, = tag, + command, len); + + memcpy(r->cmd, cmd, cmdlen); + r->cmdlen =3D cmdlen; + + if (len =3D=3D 0) { + ret =3D execute_command(s->bdrv, r->cmd, r->cmdlen, NULL, 0, + r->sensebuf, sizeof(r->sensebuf), + SG_DXFER_NONE, NULL); + if (ret =3D=3D -1) { + scsi_command_complete(r, HARDWARE_ERROR); + return 0; + } + r->driver_status =3D ret; + + scsi_command_complete(r, scsi_get_sense(r)); + return 0; + } + + if (r->buflen !=3D len) { + if (r->buf !=3D NULL) + free(r->buf); + posix_memalign((void**)&r->buf, 512, len); + r->buflen =3D len; + } + + memset(r->buf, 0, r->buflen); + r->len =3D len; + if (is_write(cmd[0])) { + r->len =3D 0; + return -len; + } + + ret =3D execute_command(s->bdrv, r->cmd, r->cmdlen, r->buf, r->len, + r->sensebuf, sizeof(r->sensebuf), + SG_DXFER_FROM_DEV, &len); + if (ret =3D=3D -1) { + scsi_command_complete(r, HARDWARE_ERROR); + return 0; + } + r->len =3D len; + r->driver_status =3D ret; + + return len; +} + +static int get_blocksize(BlockDriverState *bdrv) +{ + uint8_t cmd[10]; + uint8_t buf[8]; + uint8_t sensebuf[8]; + int ret; + + memset(cmd, sizeof(cmd), 0); + memset(buf, sizeof(buf), 0); + cmd[0] =3D READ_CAPACITY; + ret =3D execute_command(bdrv, cmd, sizeof(cmd), buf, sizeof(buf), + sensebuf, sizeof(sensebuf), + SG_DXFER_FROM_DEV, NULL); + if (ret < 0) + return -1; + return (buf[4] << 24) | (buf[5] << 16) | (buf[6] << 8) | buf[7]; +} + +static void scsi_destroy(SCSIDevice *d) +{ + SCSIRequest *r, *n; + + r =3D d->state->requests; + while (r) { + n =3D r->next; + qemu_free(r); + r =3D n; + } + + r =3D free_requests; + while (r) { + n =3D r->next; + qemu_free(r); + r =3D n; + } + + qemu_free(d->state); + qemu_free(d); +} + +SCSIDevice *scsi_generic_init(BlockDriverState *bdrv, int tcq, + scsi_completionfn completion, void *opaque= ) +{ + int sg_version; + SCSIDevice *d; + SCSIDeviceState *s; + struct sg_scsi_id scsiid; + + /* check we are really using a /dev/sg* file */ + + if (!bdrv_is_sg(bdrv)) + return NULL; + + /* check we are using a driver managing SG_IO (version 3 and after *= / + + if (bdrv_ioctl(bdrv, SG_GET_VERSION_NUM, (char*)&sg_version) < 0 || + sg_version < 30000) + return NULL; + + /* get LUN of the /dev/sg? */ + + if (bdrv_ioctl(bdrv, SG_GET_SCSI_ID, &scsiid)) + return NULL; + + /* define device state */ + + s =3D (SCSIDeviceState *)qemu_mallocz(sizeof(SCSIDeviceState)); + s->bdrv =3D bdrv; + s->requests =3D NULL; + s->completion =3D completion; + s->opaque =3D opaque; + s->lun =3D scsiid.lun; + s->blocksize =3D get_blocksize(s->bdrv); + /* removable media returns 0 if not present */ + if (s->blocksize <=3D 0) + s->blocksize =3D 2048; + + /* define function to manage device */ + + d =3D (SCSIDevice *)qemu_mallocz(sizeof(SCSIDevice)); + d->state =3D s; + d->destroy =3D scsi_destroy; + d->send_command =3D scsi_send_command; + d->read_data =3D scsi_read_data; + d->write_data =3D scsi_write_data; + d->cancel_io =3D scsi_cancel_io; + d->get_buf =3D scsi_get_buf; + + return d; +} +#endif /* __linux__ */ Index: qemu/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/Makefile 2007-11-28 11:39:19.000000000 +0100 +++ qemu/Makefile 2007-11-28 11:44:37.000000000 +0100 @@ -56,6 +56,7 @@ OBJS+=3Dirq.o OBJS+=3Di2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o OBJS+=3Dssd0303.o ssd0323.o ads7846.o stellaris_input.o OBJS+=3Dscsi-disk.o cdrom.o +OBJS+=3Dscsi-generic.o OBJS+=3Dusb.o usb-hub.o usb-linux.o usb-hid.o usb-msd.o usb-wacom.o OBJS+=3Dsd.o ssi-sd.o =20 Index: qemu/hw/scsi-disk.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/scsi-disk.h 2007-11-28 11:39:19.000000000 +0100 +++ qemu/hw/scsi-disk.h 2007-11-28 11:44:37.000000000 +0100 @@ -7,24 +7,27 @@ enum scsi_reason { SCSI_REASON_DATA /* Transfer complete, more data required. */ }; =20 +typedef struct SCSIDeviceState SCSIDeviceState; typedef struct SCSIDevice SCSIDevice; typedef void (*scsi_completionfn)(void *opaque, int reason, uint32_t tag= , uint32_t arg); =20 -SCSIDevice *scsi_disk_init(BlockDriverState *bdrv, - int tcq, - scsi_completionfn completion, - void *opaque); -void scsi_disk_destroy(SCSIDevice *s); +struct SCSIDevice +{ + SCSIDeviceState *state; + void (*destroy)(SCSIDevice *s); + int32_t (*send_command)(SCSIDevice *s, uint32_t tag, uint8_t *buf, + int lun); + void (*read_data)(SCSIDevice *s, uint32_t tag); + int (*write_data)(SCSIDevice *s, uint32_t tag); + void (*cancel_io)(SCSIDevice *s, uint32_t tag); + uint8_t *(*get_buf)(SCSIDevice *s, uint32_t tag); +}; =20 -int32_t scsi_send_command(SCSIDevice *s, uint32_t tag, uint8_t *buf, int= lun); -/* SCSI data transfers are asynchrnonous. However, unlike the block IO - layer the completion routine may be called directly by - scsi_{read,write}_data. */ -void scsi_read_data(SCSIDevice *s, uint32_t tag); -int scsi_write_data(SCSIDevice *s, uint32_t tag); -void scsi_cancel_io(SCSIDevice *s, uint32_t tag); -uint8_t *scsi_get_buf(SCSIDevice *s, uint32_t tag); +SCSIDevice *scsi_disk_init(BlockDriverState *bdrv, int tcq, + scsi_completionfn completion, void *opaque); +SCSIDevice *scsi_generic_init(BlockDriverState *bdrv, int tcq, + scsi_completionfn completion, void *opaque); =20 /* cdrom.c */ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_trac= k);