From 2599aece1b222ad4f9714275b38bf1d3e9424b54 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 3 Aug 2011 10:49:11 +0200 Subject: scsi: introduce SCSICommand This struct is currently unnamed. Give it a name and use it explicitly to decouple (some parts of) CDB parsing from SCSIRequest. Signed-off-by: Paolo Bonzini Signed-off-by: Anthony Liguori --- hw/scsi.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'hw/scsi.h') diff --git a/hw/scsi.h b/hw/scsi.h index 7ed755071..f29d65fd5 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -11,6 +11,7 @@ typedef struct SCSIBus SCSIBus; typedef struct SCSIBusOps SCSIBusOps; +typedef struct SCSICommand SCSICommand; typedef struct SCSIDevice SCSIDevice; typedef struct SCSIDeviceInfo SCSIDeviceInfo; typedef struct SCSIRequest SCSIRequest; @@ -30,6 +31,14 @@ typedef struct SCSISense { #define SCSI_SENSE_BUF_SIZE 96 +struct SCSICommand { + uint8_t buf[SCSI_CMD_BUF_SIZE]; + int len; + size_t xfer; + uint64_t lba; + enum SCSIXferMode mode; +}; + struct SCSIRequest { SCSIBus *bus; SCSIDevice *dev; @@ -38,13 +47,7 @@ struct SCSIRequest { uint32_t tag; uint32_t lun; uint32_t status; - struct { - uint8_t buf[SCSI_CMD_BUF_SIZE]; - int len; - size_t xfer; - uint64_t lba; - enum SCSIXferMode mode; - } cmd; + SCSICommand cmd; BlockDriverAIOCB *aiocb; uint8_t sense[SCSI_SENSE_BUF_SIZE]; uint32_t sense_len; -- cgit v1.2.3