@@ -726,6 +726,8 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOBlock *s = VIRTIO_BLK(dev);
+ DeviceClass *parent_dc = DEVICE_CLASS(VIRTIO_BLK_GET_PARENT_CLASS(dev));
+
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
remove_migration_state_change_notifier(&s->migration_state_notifier);
virtio_blk_data_plane_destroy(s->dataplane);
@@ -735,6 +737,8 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
unregister_savevm(dev, "virtio-blk", s);
blockdev_mark_auto_del(s->bs);
virtio_cleanup(vdev);
+
+ parent_dc->unrealize(dev, errp);
}
static Property virtio_blk_properties[] = {
@@ -996,6 +996,8 @@ static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOSerial *vser = VIRTIO_SERIAL(dev);
+ ObjectClass *parent_oc = VIRTIO_SERIAL_GET_PARENT_CLASS(dev);
+ DeviceClass *parent_dc = DEVICE_CLASS(parent_oc);
unregister_savevm(dev, "virtio-console", vser);
@@ -1009,6 +1011,8 @@ static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp)
g_free(vser->post_load);
}
virtio_cleanup(vdev);
+
+ parent_dc->unrealize(dev, errp);
}
static Property virtio_serial_properties[] = {
@@ -1573,6 +1573,8 @@ static void virtio_net_device_unrealize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIONet *n = VIRTIO_NET(dev);
+ ObjectClass *parent_oc = VIRTIO_NET_GET_PARENT_CLASS(dev);
+ DeviceClass *parent_dc = DEVICE_CLASS(parent_oc);
int i;
/* This will stop vhost backend if appropriate. */
@@ -1609,6 +1611,8 @@ static void virtio_net_device_unrealize(DeviceState *dev, Error **errp)
g_free(n->vqs);
qemu_del_nic(n->nic);
virtio_cleanup(vdev);
+
+ parent_dc->unrealize(dev, errp);
}
static void virtio_net_instance_init(Object *obj)
@@ -248,6 +248,8 @@ static void vhost_scsi_unrealize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VHostSCSI *s = VHOST_SCSI(dev);
+ ObjectClass *parent_oc = VHOST_SCSI_GET_PARENT_CLASS(dev);
+ DeviceClass *parent_dc = DEVICE_CLASS(parent_oc);
migrate_del_blocker(s->migration_blocker);
error_free(s->migration_blocker);
@@ -258,6 +260,8 @@ static void vhost_scsi_unrealize(DeviceState *dev, Error **errp)
g_free(s->dev.vqs);
virtio_scsi_common_unrealize(dev, errp);
+
+ parent_dc->unrealize(dev, errp);
}
static Property vhost_scsi_properties[] = {
@@ -655,10 +655,14 @@ void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp)
static void virtio_scsi_device_unrealize(DeviceState *dev, Error **errp)
{
VirtIOSCSI *s = VIRTIO_SCSI(dev);
+ ObjectClass *parent_oc = VIRTIO_SCSI_GET_PARENT_CLASS(dev);
+ DeviceClass *parent_dc = DEVICE_CLASS(parent_oc);
unregister_savevm(dev, "virtio-scsi", s);
virtio_scsi_common_unrealize(dev, errp);
+
+ parent_dc->unrealize(dev, errp);
}
static Property virtio_scsi_properties[] = {
@@ -378,11 +378,15 @@ static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOBalloon *s = VIRTIO_BALLOON(dev);
+ ObjectClass *parent_oc = VIRTIO_BALLOON_GET_PARENT_CLASS(dev);
+ DeviceClass *parent_dc = DEVICE_CLASS(parent_oc);
balloon_stats_destroy_timer(s);
qemu_remove_balloon_handler(s);
unregister_savevm(dev, "virtio-balloon", s);
virtio_cleanup(vdev);
+
+ parent_dc->unrealize(dev, errp);
}
static Property virtio_balloon_properties[] = {
@@ -189,11 +189,15 @@ static void virtio_rng_device_unrealize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIORNG *vrng = VIRTIO_RNG(dev);
+ ObjectClass *parent_oc = VIRTIO_RNG_GET_PARENT_CLASS(dev);
+ DeviceClass *parent_dc = DEVICE_CLASS(parent_oc);
qemu_del_timer(vrng->rate_limit_timer);
qemu_free_timer(vrng->rate_limit_timer);
unregister_savevm(dev, "virtio-rng", vrng);
virtio_cleanup(vdev);
+
+ parent_dc->unrealize(dev, errp);
}
static Property virtio_rng_properties[] = {
VirtioDevice's DeviceClass::exit code cleaning up bus_name was overwritten by virtio-{blk,serial,net,scsi,balloon,rng} and vhost-scsi. Call their parent's DeviceClass::unrealize to fix this. Signed-off-by: Andreas Färber <afaerber@suse.de> --- hw/block/virtio-blk.c | 4 ++++ hw/char/virtio-serial-bus.c | 4 ++++ hw/net/virtio-net.c | 4 ++++ hw/scsi/vhost-scsi.c | 4 ++++ hw/scsi/virtio-scsi.c | 4 ++++ hw/virtio/virtio-balloon.c | 4 ++++ hw/virtio/virtio-rng.c | 4 ++++ 7 files changed, 28 insertions(+)