scsi: move scsi-disk.h -> scsi.h
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
1cd3af5480
commit
43b443b668
|
@ -26,7 +26,7 @@
|
||||||
here. */
|
here. */
|
||||||
|
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "scsi-disk.h"
|
#include "scsi.h"
|
||||||
|
|
||||||
static void lba_to_msf(uint8_t *buf, int lba)
|
static void lba_to_msf(uint8_t *buf, int lba)
|
||||||
{
|
{
|
||||||
|
|
2
hw/esp.c
2
hw/esp.c
|
@ -23,7 +23,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "sysbus.h"
|
#include "sysbus.h"
|
||||||
#include "scsi-disk.h"
|
#include "scsi.h"
|
||||||
#include "esp.h"
|
#include "esp.h"
|
||||||
|
|
||||||
/* debug ESP card */
|
/* debug ESP card */
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <hw/hw.h>
|
#include <hw/hw.h>
|
||||||
#include <hw/pc.h>
|
#include <hw/pc.h>
|
||||||
#include <hw/pci.h>
|
#include <hw/pci.h>
|
||||||
#include <hw/scsi-disk.h>
|
#include <hw/scsi.h>
|
||||||
#include <hw/sh.h>
|
#include <hw/sh.h>
|
||||||
#include "block.h"
|
#include "block.h"
|
||||||
#include "block_int.h"
|
#include "block_int.h"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
#include "hw.h"
|
#include "hw.h"
|
||||||
#include "pci.h"
|
#include "pci.h"
|
||||||
#include "scsi-disk.h"
|
#include "scsi.h"
|
||||||
#include "block_int.h"
|
#include "block_int.h"
|
||||||
|
|
||||||
//#define DEBUG_LSI
|
//#define DEBUG_LSI
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include "pc.h"
|
#include "pc.h"
|
||||||
#include "monitor.h"
|
#include "monitor.h"
|
||||||
#include "block_int.h"
|
#include "block_int.h"
|
||||||
#include "scsi-disk.h"
|
#include "scsi.h"
|
||||||
#include "virtio-blk.h"
|
#include "virtio-blk.h"
|
||||||
#include "qemu-config.h"
|
#include "qemu-config.h"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "hw.h"
|
#include "hw.h"
|
||||||
#include "sysemu.h"
|
#include "sysemu.h"
|
||||||
#include "scsi-disk.h"
|
#include "scsi.h"
|
||||||
#include "block.h"
|
#include "block.h"
|
||||||
#include "qdev.h"
|
#include "qdev.h"
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ do { fprintf(stderr, "scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
|
||||||
|
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "block.h"
|
#include "block.h"
|
||||||
#include "scsi-disk.h"
|
#include "scsi.h"
|
||||||
|
|
||||||
#define SENSE_NO_SENSE 0
|
#define SENSE_NO_SENSE 0
|
||||||
#define SENSE_NOT_READY 2
|
#define SENSE_NOT_READY 2
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "block.h"
|
#include "block.h"
|
||||||
#include "scsi-disk.h"
|
#include "scsi.h"
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,67 @@
|
||||||
|
#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
|
|
@ -12,7 +12,7 @@
|
||||||
#include "qemu-config.h"
|
#include "qemu-config.h"
|
||||||
#include "usb.h"
|
#include "usb.h"
|
||||||
#include "block.h"
|
#include "block.h"
|
||||||
#include "scsi-disk.h"
|
#include "scsi.h"
|
||||||
#include "console.h"
|
#include "console.h"
|
||||||
#include "monitor.h"
|
#include "monitor.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue