ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-blk: switch exit callback to VirtioDeviceClass 

This ensures hot-unplug is handled properly by the proxy, and avoids
leaking bus_name which is freed by virtio_device_exit.

Cc: qemu-stable@nongnu.org
Acked-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-09-20 14:05:42 +02:00
parent 5e96f5d2f8
commit 40dfc16f5f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/block/virtio-blk.c
View File

@ -728,20 +728,18 @@ static int virtio_blk_device_init(VirtIODevice *vdev)
return 0; return 0;
} }
static int virtio_blk_device_exit(DeviceState *dev) static void virtio_blk_device_exit(VirtIODevice *vdev)
{ {
VirtIODevice *vdev = VIRTIO_DEVICE(dev); VirtIOBlock *s = VIRTIO_BLK(vdev);
VirtIOBlock *s = VIRTIO_BLK(dev);
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
remove_migration_state_change_notifier(&s->migration_state_notifier); remove_migration_state_change_notifier(&s->migration_state_notifier);
virtio_blk_data_plane_destroy(s->dataplane); virtio_blk_data_plane_destroy(s->dataplane);
s->dataplane = NULL; s->dataplane = NULL;
#endif #endif
qemu_del_vm_change_state_handler(s->change); qemu_del_vm_change_state_handler(s->change);
unregister_savevm(dev, "virtio-blk", s); unregister_savevm(DEVICE(vdev), "virtio-blk", s);
blockdev_mark_auto_del(s->bs); blockdev_mark_auto_del(s->bs);
virtio_cleanup(vdev); virtio_cleanup(vdev);
return 0;
} }
static Property virtio_blk_properties[] = { static Property virtio_blk_properties[] = {
@ -753,10 +751,10 @@ static void virtio_blk_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
dc->exit = virtio_blk_device_exit;
dc->props = virtio_blk_properties; dc->props = virtio_blk_properties;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
vdc->init = virtio_blk_device_init; vdc->init = virtio_blk_device_init;
vdc->exit = virtio_blk_device_exit;
vdc->get_config = virtio_blk_update_config; vdc->get_config = virtio_blk_update_config;
vdc->set_config = virtio_blk_set_config; vdc->set_config = virtio_blk_set_config;
vdc->get_features = virtio_blk_get_features; vdc->get_features = virtio_blk_get_features;