| Message ID | 20190626123948.10199-5-shmuel.eiderman@oracle.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add Qemu to SeaBIOS LCHS interface | expand |
On 26.06.19 14:39, Sam Eiderman wrote: > 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> > Signed-off-by: Sam Eiderman <shmuel.eiderman@oracle.com> > --- > 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 [...] > @@ -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)); (I see this code for the first time, but) I suppose I’d put the scsi_device_unrealize() after scsi_device_purge_requests(). Max > blockdev_mark_auto_del(dev->conf.blk); > }
> @@ -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)); (I see this code for the first time, but) I suppose I’d put the scsi_device_unrealize() after scsi_device_purge_requests(). Max > blockdev_mark_auto_del(dev->conf.blk); > } - shmuel.eiderman@oracle.com + sameid@google.com Sure, I'll resubmit Sam
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,