diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-09-20 14:05:42 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-09 21:46:48 +0100 |
| commit | 40dfc16f5fe0afb66f9436718781264dfadb6c61 (patch) | |
| tree | 49940da19ef4aa515980b191064ddcb31d804073 | |
| parent | 5e96f5d2f8d2696ef7d2d8d7282c18fa6023470b (diff) | |
| download | focaccia-qemu-40dfc16f5fe0afb66f9436718781264dfadb6c61.tar.gz focaccia-qemu-40dfc16f5fe0afb66f9436718781264dfadb6c61.zip | |
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>
| -rw-r--r-- | hw/block/virtio-blk.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 13f6d8276e..7f0440f3a8 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -728,20 +728,18 @@ static int virtio_blk_device_init(VirtIODevice *vdev) 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(dev); + VirtIOBlock *s = VIRTIO_BLK(vdev); #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE remove_migration_state_change_notifier(&s->migration_state_notifier); virtio_blk_data_plane_destroy(s->dataplane); s->dataplane = NULL; #endif 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); virtio_cleanup(vdev); - return 0; } static Property virtio_blk_properties[] = { @@ -753,10 +751,10 @@ static void virtio_blk_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); - dc->exit = virtio_blk_device_exit; dc->props = virtio_blk_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); vdc->init = virtio_blk_device_init; + vdc->exit = virtio_blk_device_exit; vdc->get_config = virtio_blk_update_config; vdc->set_config = virtio_blk_set_config; vdc->get_features = virtio_blk_get_features; |