[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/9] scsi: Propagate unrealize() callback to scsi-hd
From: |
John Snow |
Subject: |
[PULL 5/9] scsi: Propagate unrealize() callback to scsi-hd |
Date: |
Thu, 31 Oct 2019 06:59:00 -0400 |
From: Sam Eiderman <address@hidden>
We will need to add LCHS removal logic to scsi-hd's unrealize() in the
next commit.
Reviewed-by: Karl Heubaum <address@hidden>
Reviewed-by: Arbel Moshe <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Sam Eiderman <address@hidden>
Signed-off-by: Sam Eiderman <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
include/hw/scsi/scsi.h | 1 +
hw/scsi/scsi-bus.c | 16 ++++++++++++++++
2 files changed, 17 insertions(+)
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index d77a92361b..332ef602f4 100644
--- a/include/hw/scsi/scsi.h
+++ b/include/hw/scsi/scsi.h
@@ -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,
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index bccb7cc4c6..359d50d6d0 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -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);
}
--
2.21.0
- [PULL 0/9] Ide patches, John Snow, 2019/10/31
- [PULL 1/9] IDE: deprecate ide-drive, John Snow, 2019/10/31
- [PULL 2/9] block: Refactor macros - fix tabbing, John Snow, 2019/10/31
- [PULL 3/9] block: Support providing LCHS from user, John Snow, 2019/10/31
- [PULL 4/9] bootdevice: Add interface to gather LCHS, John Snow, 2019/10/31
- [PULL 5/9] scsi: Propagate unrealize() callback to scsi-hd,
John Snow <=
- [PULL 6/9] bootdevice: Gather LCHS from all relevant devices, John Snow, 2019/10/31
- [PULL 7/9] bootdevice: Refactor get_boot_devices_list, John Snow, 2019/10/31
- [PULL 8/9] bootdevice: FW_CFG interface for LCHS values, John Snow, 2019/10/31
- [PULL 9/9] hd-geo-test: Add tests for lchs override, John Snow, 2019/10/31
- Re: [libvirt] [PULL 0/9] Ide patches, no-reply, 2019/10/31
- Re: [PULL 0/9] Ide patches, Peter Maydell, 2019/10/31