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: Karl Heubaum <karl.heubaum@oracle.com> Reviewed-by: Arbel Moshe <arbel.moshe@oracle.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Sam Eiderman <shmuel.eiderman@oracle.com> Signed-off-by: Sam Eiderman <sameid@google.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
f7209ea1be
commit
6b98c5aae6
|
@ -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,
|
int scsi_bus_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf,
|
||||||
void *hba_private)
|
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)
|
static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp)
|
||||||
{
|
{
|
||||||
SCSIDevice *dev = SCSI_DEVICE(qdev);
|
SCSIDevice *dev = SCSI_DEVICE(qdev);
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
if (dev->vmsentry) {
|
if (dev->vmsentry) {
|
||||||
qemu_del_vm_change_state_handler(dev->vmsentry);
|
qemu_del_vm_change_state_handler(dev->vmsentry);
|
||||||
}
|
}
|
||||||
|
|
||||||
scsi_device_purge_requests(dev, SENSE_CODE(NO_SENSE));
|
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);
|
blockdev_mark_auto_del(dev->conf.blk);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -59,6 +59,7 @@ struct SCSIRequest {
|
||||||
typedef struct SCSIDeviceClass {
|
typedef struct SCSIDeviceClass {
|
||||||
DeviceClass parent_class;
|
DeviceClass parent_class;
|
||||||
void (*realize)(SCSIDevice *dev, Error **errp);
|
void (*realize)(SCSIDevice *dev, Error **errp);
|
||||||
|
void (*unrealize)(SCSIDevice *dev, Error **errp);
|
||||||
int (*parse_cdb)(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf,
|
int (*parse_cdb)(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf,
|
||||||
void *hba_private);
|
void *hba_private);
|
||||||
SCSIRequest *(*alloc_req)(SCSIDevice *s, uint32_t tag, uint32_t lun,
|
SCSIRequest *(*alloc_req)(SCSIDevice *s, uint32_t tag, uint32_t lun,
|
||||||
|
|
Loading…
Reference in a new issue