diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-11-26 15:33:47 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 09:41:36 -0600 |
commit | 1e37607b5e32dc5f4ee422ae45da4de659db0691 (patch) | |
tree | 4353fd29e540d35836b2364d0dcc269454e5c42e | |
parent | f5c5e38179aff8cc9bb8bd4c9fe42966f0e9f9fd (diff) | |
download | qemu-1e37607b5e32dc5f4ee422ae45da4de659db0691.zip qemu-1e37607b5e32dc5f4ee422ae45da4de659db0691.tar.gz qemu-1e37607b5e32dc5f4ee422ae45da4de659db0691.tar.bz2 |
scsi: add/fix header protection.
Also delete the leftover and unused scsi-disk.h file.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | hw/esp.h | 5 | ||||
-rw-r--r-- | hw/scsi-disk.h | 67 | ||||
-rw-r--r-- | hw/scsi.h | 4 |
3 files changed, 7 insertions, 69 deletions
@@ -1,3 +1,6 @@ +#ifndef QEMU_HW_ESP_H +#define QEMU_HW_ESP_H + /* esp.c */ #define ESP_MAX_DEVS 7 typedef void (*espdma_memory_read_write)(void *opaque, uint8_t *buf, int len); @@ -5,3 +8,5 @@ void esp_init(target_phys_addr_t espaddr, int it_shift, espdma_memory_read_write dma_memory_read, espdma_memory_read_write dma_memory_write, void *dma_opaque, qemu_irq irq, qemu_irq *reset); + +#endif diff --git a/hw/scsi-disk.h b/hw/scsi-disk.h deleted file mode 100644 index b6b6c12..0000000 --- a/hw/scsi-disk.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef SCSI_DISK_H -#define SCSI_DISK_H - -#include "qdev.h" - -/* scsi-disk.c */ -enum scsi_reason { - SCSI_REASON_DONE, /* Command complete. */ - SCSI_REASON_DATA /* Transfer complete, more data required. */ -}; - -typedef struct SCSIBus SCSIBus; -typedef struct SCSIDevice SCSIDevice; -typedef struct SCSIDeviceInfo SCSIDeviceInfo; -typedef void (*scsi_completionfn)(SCSIBus *bus, int reason, uint32_t tag, - uint32_t arg); - -struct SCSIDevice -{ - DeviceState qdev; - uint32_t id; - SCSIDeviceInfo *info; -}; - -/* cdrom.c */ -int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track); -int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num); - -/* scsi-bus.c */ -typedef int (*scsi_qdev_initfn)(SCSIDevice *dev); -struct SCSIDeviceInfo { - DeviceInfo qdev; - scsi_qdev_initfn init; - 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); -}; - -typedef void (*SCSIAttachFn)(DeviceState *host, BlockDriverState *bdrv, - int unit); -struct SCSIBus { - BusState qbus; - int busnr; - - int tcq, ndev; - scsi_completionfn complete; - - SCSIDevice *devs[8]; -}; - -void scsi_bus_new(SCSIBus *bus, DeviceState *host, int tcq, int ndev, - scsi_completionfn complete); -void scsi_qdev_register(SCSIDeviceInfo *info); - -static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d) -{ - return DO_UPCAST(SCSIBus, qbus, d->qdev.parent_bus); -} - -SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, DriveInfo *dinfo, int unit); -void scsi_bus_legacy_handle_cmdline(SCSIBus *bus); - -#endif @@ -1,5 +1,5 @@ -#ifndef SCSI_DISK_H -#define SCSI_DISK_H +#ifndef QEMU_HW_SCSI_H +#define QEMU_HW_SCSI_H #include "qdev.h" |