Commit e1dc6815 authored by Cao jin's avatar Cao jin Committed by Paolo Bonzini
Browse files

SCSI device: fix to incomplete QOMify 



Signed-off-by: default avatarCao jin <caoj.fnst@cn.fujitsu.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Message-Id: <1452073066-28319-1-git-send-email-caoj.fnst@cn.fujitsu.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1cb6d137

hw/scsi/megasas.c

+6 −6
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd) 
    info.device.type = MFI_INFO_DEV_SAS3G;

    info.device.port_count = 8;

    QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {

        SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);

        SCSIDevice *sdev = SCSI_DEVICE(kid->child);

        uint16_t pd_id;



        if (num_pd_disks < 8) {
@@ -960,7 +960,7 @@ static int megasas_dcmd_pd_get_list(MegasasState *s, MegasasCmd *cmd) 
        max_pd_disks = MFI_MAX_SYS_PDS;

    }

    QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {

        SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);

        SCSIDevice *sdev = SCSI_DEVICE(kid->child);

        uint16_t pd_id;



        if (num_pd_disks >= max_pd_disks)
@@ -1136,7 +1136,7 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, MegasasCmd *cmd) 
        max_ld_disks = MFI_MAX_LD;

    }

    QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {

        SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);

        SCSIDevice *sdev = SCSI_DEVICE(kid->child);



        if (num_ld_disks >= max_ld_disks) {

            break;
@@ -1187,7 +1187,7 @@ static int megasas_dcmd_ld_list_query(MegasasState *s, MegasasCmd *cmd) 
        max_ld_disks = MFI_MAX_LD;

    }

    QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {

        SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);

        SCSIDevice *sdev = SCSI_DEVICE(kid->child);



        if (num_ld_disks >= max_ld_disks) {

            break;
@@ -1327,7 +1327,7 @@ static int megasas_dcmd_cfg_read(MegasasState *s, MegasasCmd *cmd) 
    ld_offset = array_offset + sizeof(struct mfi_array) * num_pd_disks;



    QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {

        SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);

        SCSIDevice *sdev = SCSI_DEVICE(kid->child);

        uint16_t sdev_id = ((sdev->id & 0xFF) << 8) | (sdev->lun & 0xFF);

        struct mfi_array *array;

        struct mfi_ld_config *ld;
@@ -2237,7 +2237,7 @@ static void megasas_soft_reset(MegasasState *s) 
         * after the initial reset.

         */

        QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {

            SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);

            SCSIDevice *sdev = SCSI_DEVICE(kid->child);



            sdev->unit_attention = SENSE_CODE(NO_SENSE);

            scsi_device_unit_attention_reported(sdev);

hw/scsi/scsi-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense) 


static char *scsibus_get_dev_path(DeviceState *dev)

{

    SCSIDevice *d = DO_UPCAST(SCSIDevice, qdev, dev);

    SCSIDevice *d = SCSI_DEVICE(dev);

    DeviceState *hba = dev->parent_bus->parent;

    char *id;

    char *path;
@@ -2034,7 +2034,7 @@ static void scsi_device_class_init(ObjectClass *klass, void *data) 
static void scsi_dev_instance_init(Object *obj)

{

    DeviceState *dev = DEVICE(obj);

    SCSIDevice *s = DO_UPCAST(SCSIDevice, qdev, dev);

    SCSIDevice *s = SCSI_DEVICE(dev);



    device_add_bootindex_property(obj, &s->conf.bootindex,

                                  "bootindex", NULL,

hw/scsi/virtio-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req) 
        target = req->req.tmf.lun[1];

        s->resetting++;

        QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {

             d = DO_UPCAST(SCSIDevice, qdev, kid->child);

             d = SCSI_DEVICE(kid->child);

             if (d->channel == 0 && d->id == target) {

                qdev_reset_all(&d->qdev);

             }