| From f9630bb1a1267c9d3f8b2d3e70bfa9a05bd0cf07 Mon Sep 17 00:00:00 2001 |
| From: Markus Armbruster <armbru@redhat.com> |
| Date: Thu, 23 Jan 2014 14:03:34 +0100 |
| Subject: [PATCH 07/14] virtio-blk: switch exit callback to VirtioDeviceClass |
| |
| RH-Author: Markus Armbruster <armbru@redhat.com> |
| Message-id: <1390485820-7585-5-git-send-email-armbru@redhat.com> |
| Patchwork-id: 56922 |
| O-Subject: [PATCH 7.0 qemu-kvm 04/10] virtio-blk: switch exit callback to VirtioDeviceClass |
| Bugzilla: 983344 |
| RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com> |
| RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com> |
| RH-Acked-by: Michael S. Tsirkin <mst@redhat.com> |
| |
| From: Paolo Bonzini <pbonzini@redhat.com> |
| |
| 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> |
| (cherry picked from commit 40dfc16f5fe0afb66f9436718781264dfadb6c61) |
| Signed-off-by: Markus Armbruster <armbru@redhat.com> |
| |
| hw/block/virtio-blk.c | 10 ++++------ |
| 1 file changed, 4 insertions(+), 6 deletions(-) |
| |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| 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 49a23c3..aa37cc9 100644 |
| |
| |
| @@ -729,20 +729,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[] = { |
| @@ -754,10 +752,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; |
| -- |
| 1.7.1 |
| |