Commit 6b98c5aa authored by Sam Eiderman's avatar Sam Eiderman Committed by John Snow
Browse files

scsi: Propagate unrealize() callback to scsi-hd 



We will need to add LCHS removal logic to scsi-hd's unrealize() in the
next commit.

Reviewed-by: default avatarKarl Heubaum <karl.heubaum@oracle.com>
Reviewed-by: default avatarArbel Moshe <arbel.moshe@oracle.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarSam Eiderman <shmuel.eiderman@oracle.com>
Signed-off-by: default avatarSam Eiderman <sameid@google.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent f7209ea1

hw/scsi/scsi-bus.c

+16 −0
Original line number Diff line number Diff line
@@ -59,6 +59,14 @@ static void scsi_device_realize(SCSIDevice *s, Error **errp) 
    }

}



static void scsi_device_unrealize(SCSIDevice *s, Error **errp)

{

    SCSIDeviceClass *sc = SCSI_DEVICE_GET_CLASS(s);

    if (sc->unrealize) {

        sc->unrealize(s, errp);

    }

}



int scsi_bus_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf,

                       void *hba_private)

{
@@ -217,12 +225,20 @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp) 
static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp)

{

    SCSIDevice *dev = SCSI_DEVICE(qdev);

    Error *local_err = NULL;



    if (dev->vmsentry) {

        qemu_del_vm_change_state_handler(dev->vmsentry);

    }



    scsi_device_purge_requests(dev, SENSE_CODE(NO_SENSE));



    scsi_device_unrealize(dev, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;

    }



    blockdev_mark_auto_del(dev->conf.blk);

}

include/hw/scsi/scsi.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct SCSIRequest { 
typedef struct SCSIDeviceClass {

    DeviceClass parent_class;

    void (*realize)(SCSIDevice *dev, Error **errp);

    void (*unrealize)(SCSIDevice *dev, Error **errp);

    int (*parse_cdb)(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf,

                     void *hba_private);

    SCSIRequest *(*alloc_req)(SCSIDevice *s, uint32_t tag, uint32_t lun,