[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/11] virtio-blk: switch exit callback to VirtioDev
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 05/11] virtio-blk: switch exit callback to VirtioDeviceClass |
Date: |
Fri, 20 Sep 2013 16:57:54 +0200 |
This ensures hot-unplug is handled properly by the proxy.
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/block/virtio-blk.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index e2f55cc..5f99bfa 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -709,20 +709,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[] = {
@@ -734,10 +732,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.8.3.1
- [Qemu-devel] [PATCH 00/11] virtio: cleanup and fix hot-unplug, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 01/11] virtio-bus: remove vdev field, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 02/11] virtio-pci: remove vdev field, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 03/11] virtio-ccw: remove vdev field, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 04/11] virtio-bus: cleanup plug/unplug interface, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 05/11] virtio-blk: switch exit callback to VirtioDeviceClass,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/11] virtio-serial: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 07/11] virtio-net: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 08/11] virtio-scsi: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 09/11] virtio-balloon: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 10/11] virtio-rng: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 11/11] virtio-pci: add device_unplugged callback, Paolo Bonzini, 2013/09/20
- Re: [Qemu-devel] [PATCH 00/11] virtio: cleanup and fix hot-unplug, Michael S. Tsirkin, 2013/09/21