On 08/18/2015 01:42 AM, Alexander Bezzubikov wrote:
> Signed-off-by: Alexander Bezzubikov <abezzubi...@ispras.ru>
> ---
> hw/ide/bridge.h | 9 +++++++++
> hw/ide/internal.h | 3 ++-
> hw/ide/qdev.c | 40 ++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 51 insertions(+), 1 deletion(-)
> create mode 100644 hw/ide/bridge.h
>
> diff --git a/hw/ide/bridge.h b/hw/ide/bridge.h
> new file mode 100644
> index 0000000..dca5d73
> --- /dev/null
> +++ b/hw/ide/bridge.h
> @@ -0,0 +1,9 @@
> +#ifndef HW_IDE_BRIDGE_H
> +#define HW_IDE_BRIDGE_H
> +
> +#include "hw/ide/internal.h"
> +
> +void ide_bridge_start_transfer(SCSIRequest *req, uint32_t len);
> +void ide_bridge_complete(SCSIRequest *req, uint32_t status, size_t resid);
> +
> +#endif
> diff --git a/hw/ide/internal.h b/hw/ide/internal.h
> index 30fdcbc..f2999ce 100644
> --- a/hw/ide/internal.h
> +++ b/hw/ide/internal.h
> @@ -12,6 +12,7 @@
> #include "sysemu/sysemu.h"
> #include "hw/block/block.h"
> #include "block/scsi.h"
> +#include "hw/scsi/scsi.h"
>
> /* debug IDE devices */
> //#define DEBUG_IDE
> @@ -317,7 +318,7 @@ typedef struct IDEDMAOps IDEDMAOps;
> #define SMART_DISABLE 0xd9
> #define SMART_STATUS 0xda
>
> -typedef enum { IDE_HD, IDE_CD, IDE_CFATA } IDEDriveKind;
> +typedef enum { IDE_HD, IDE_CD, IDE_CFATA, IDE_BRIDGE } IDEDriveKind;
>
> typedef void EndTransferFunc(IDEState *);
>
This change doesn't need the scsi.h include; please move it to the
patch where the SCSI prototypes are used.
> diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
> index 788b361..e96a6e9 100644
> --- a/hw/ide/qdev.c
> +++ b/hw/ide/qdev.c
> @@ -25,6 +25,7 @@
> #include "hw/block/block.h"
> #include "sysemu/sysemu.h"
> #include "qapi/visitor.h"
> +#include "hw/ide/bridge.h"
>
> /* --------------------------------- */
>
> @@ -143,6 +144,17 @@ int ide_get_bios_chs_trans(BusState *bus, int unit)
> return DO_UPCAST(IDEBus, qbus, bus)->ifs[unit].chs_trans;
> }
>
> +/* BusInfo structure for ATAPI-SCSI bridge */
> +static const struct SCSIBusInfo atapi_scsi_info = {
> + .tcq = true,
> + .max_target = 0,
> + .max_lun = 0,
> +
> + .transfer_data = NULL,
> + .complete = NULL,
> + .cancel = NULL
> +};
> +
> /* --------------------------------- */
>
> typedef struct IDEDrive {
> @@ -184,6 +196,11 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind
> kind)
> dev->chs_trans) < 0) {
> return -1;
> }
> + if (kind == IDE_BRIDGE) {
> + scsi_bus_new(&dev->scsi_bus, sizeof(dev->scsi_bus), &dev->qdev,
> + &atapi_scsi_info, NULL);
> + scsi_bus_legacy_handle_cmdline(&dev->scsi_bus, NULL);
> + }
>
> if (!dev->version) {
> dev->version = g_strdup(s->version);
> @@ -253,6 +270,11 @@ static int ide_cd_initfn(IDEDevice *dev)
> return ide_dev_initfn(dev, IDE_CD);
> }
>
> +static int ide_bridge_initfn(IDEDevice *dev)
> +{
> + return ide_dev_initfn(dev, IDE_BRIDGE);
> +}
> +
> static int ide_drive_initfn(IDEDevice *dev)
> {
> DriveInfo *dinfo = blk_legacy_dinfo(dev->conf.blk);
> @@ -314,6 +336,23 @@ static const TypeInfo ide_cd_info = {
> .class_init = ide_cd_class_init,
> };
>
> +static void ide_bridge_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> + IDEDeviceClass *k = IDE_DEVICE_CLASS(klass);
> + k->init = ide_bridge_initfn;
> + dc->fw_name = "drive";
> + dc->desc = "virtual ATAPI-SCSI bridge";
> + dc->props = ide_cd_properties;
> +}
> +
> +static const TypeInfo ide_bridge_info = {
> + .name = "ide-bridge",
> + .parent = TYPE_IDE_DEVICE,
> + .instance_size = sizeof(IDEDrive),
> + .class_init = ide_bridge_class_init,
> +};
> +
> static Property ide_drive_properties[] = {
> DEFINE_IDE_DEV_PROPERTIES(),
> DEFINE_PROP_END_OF_LIST(),
> @@ -360,6 +399,7 @@ static void ide_register_types(void)
> type_register_static(&ide_bus_info);
> type_register_static(&ide_hd_info);
> type_register_static(&ide_cd_info);
> + type_register_static(&ide_bridge_info);
> type_register_static(&ide_drive_info);
> type_register_static(&ide_device_type_info);
> }
>
The rest is okay.
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
h...@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
