[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [QEMU] [PATCH v4 4/8] scsi: Propagate unrealize() callback
From: |
Sam Eiderman |
Subject: |
[Qemu-block] [QEMU] [PATCH v4 4/8] scsi: Propagate unrealize() callback to scsi-hd |
Date: |
Wed, 19 Jun 2019 12:29:01 +0300 |
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>
Signed-off-by: Sam Eiderman <address@hidden>
---
hw/scsi/scsi-bus.c | 15 +++++++++++++++
include/hw/scsi/scsi.h | 1 +
2 files changed, 16 insertions(+)
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index c480553083..f6fe497a1a 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -55,6 +55,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)
{
@@ -213,11 +221,18 @@ 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_unrealize(dev, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
scsi_device_purge_requests(dev, SENSE_CODE(NO_SENSE));
blockdev_mark_auto_del(dev->conf.blk);
}
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index 426566a5c6..8cf71f910d 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,
--
2.13.3
- [Qemu-block] [QEMU] [PATCH v4 0/8] Add Qemu to SeaBIOS LCHS interface, Sam Eiderman, 2019/06/19
- [Qemu-block] [QEMU] [PATCH v4 2/8] block: Support providing LCHS from user, Sam Eiderman, 2019/06/19
- [Qemu-block] [QEMU] [PATCH v4 3/8] bootdevice: Add interface to gather LCHS, Sam Eiderman, 2019/06/19
- [Qemu-block] [QEMU] [PATCH v4 1/8] block: Refactor macros - fix tabbing, Sam Eiderman, 2019/06/19
- [Qemu-block] [QEMU] [PATCH v4 5/8] bootdevice: Gather LCHS from all relevant devices, Sam Eiderman, 2019/06/19
- [Qemu-block] [QEMU] [PATCH v4 8/8] hd-geo-test: Add tests for lchs override, Sam Eiderman, 2019/06/19
- [Qemu-block] [QEMU] [PATCH v4 6/8] bootdevice: Refactor get_boot_devices_list, Sam Eiderman, 2019/06/19
- [Qemu-block] [QEMU] [PATCH v4 4/8] scsi: Propagate unrealize() callback to scsi-hd,
Sam Eiderman <=
- [Qemu-block] [QEMU] [PATCH v4 7/8] bootdevice: FW_CFG interface for LCHS values, Sam Eiderman, 2019/06/19
- Re: [Qemu-block] [SeaBIOS] [QEMU] [PATCH v4 0/8] Add Qemu to SeaBIOS LCHS interface, no-reply, 2019/06/19
- Re: [Qemu-block] [SeaBIOS] [QEMU] [PATCH v4 0/8] Add Qemu to SeaBIOS LCHS interface, no-reply, 2019/06/19
- Re: [Qemu-block] [SeaBIOS] [QEMU] [PATCH v4 0/8] Add Qemu to SeaBIOS LCHS interface, no-reply, 2019/06/19