On Fri, 02/27 11:43, Max Reitz wrote: > static void virtio_scsi_hotplug(HotplugHandler *hotplug_dev, DeviceState > *dev, > Error **errp) > { > @@ -763,12 +794,26 @@ static void virtio_scsi_hotplug(HotplugHandler > *hotplug_dev, DeviceState *dev, > SCSIDevice *sd = SCSI_DEVICE(dev); > > if (s->ctx && !s->dataplane_disabled) { > + VirtIOSCSIBlkChangeNotifier *insert_notifier, *remove_notifier; > + > + insert_notifier = g_new0(VirtIOSCSIBlkChangeNotifier, 1); > + insert_notifier->n.notify = virtio_scsi_blk_insert_notifier; > + insert_notifier->s = s; > + insert_notifier->sd = sd; > + blk_add_insert_bs_notifier(sd->conf.blk, &insert_notifier->n); > + QTAILQ_INSERT_TAIL(&s->insert_notifiers, insert_notifier, next);
Could you instead embed a Notifier into SCSIDevice, similarly? That way there is no need to maintain a list in VirtIOSCSI. > + > + remove_notifier = g_new0(VirtIOSCSIBlkChangeNotifier, 1); > + remove_notifier->n.notify = virtio_scsi_blk_remove_notifier; > + remove_notifier->s = s; > + remove_notifier->sd = sd; > + blk_add_remove_bs_notifier(sd->conf.blk, &remove_notifier->n); > + QTAILQ_INSERT_TAIL(&s->remove_notifiers, remove_notifier, next); > + > if (blk_op_is_blocked(sd->conf.blk, BLOCK_OP_TYPE_DATAPLANE, errp)) { > return; > } > - assert(!s->blocker); > - error_setg(&s->blocker, "block device is in use by data plane"); > - blk_op_block_all(sd->conf.blk, s->blocker); > + virtio_scsi_set_up_op_blockers(s, sd); > } Fam