diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-09-20 14:06:08 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-09 21:46:48 +0100 |
| commit | 7bb6edb0e3dd78d74e0ac980cf6c0a07307f61bf (patch) | |
| tree | 17ed0cf16441dd092ae16ec8d76e907ab21ee678 /hw/virtio | |
| parent | baa61b9870dd7e0bb07e0ae61c6ec805db13f699 (diff) | |
| download | qemu-7bb6edb0e3dd78d74e0ac980cf6c0a07307f61bf.tar.gz | |
virtio-rng: 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>
Diffstat (limited to 'hw/virtio')
| -rw-r--r-- | hw/virtio/virtio-rng.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index b22ccf1008..42ca56843b 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -190,16 +190,14 @@ static int virtio_rng_device_init(VirtIODevice *vdev) return 0; } -static int virtio_rng_device_exit(DeviceState *qdev) +static void virtio_rng_device_exit(VirtIODevice *vdev) { - VirtIORNG *vrng = VIRTIO_RNG(qdev); - VirtIODevice *vdev = VIRTIO_DEVICE(qdev); + VirtIORNG *vrng = VIRTIO_RNG(vdev); timer_del(vrng->rate_limit_timer); timer_free(vrng->rate_limit_timer); - unregister_savevm(qdev, "virtio-rng", vrng); + unregister_savevm(DEVICE(vdev), "virtio-rng", vrng); virtio_cleanup(vdev); - return 0; } static Property virtio_rng_properties[] = { @@ -211,10 +209,10 @@ static void virtio_rng_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); - dc->exit = virtio_rng_device_exit; dc->props = virtio_rng_properties; set_bit(DEVICE_CATEGORY_MISC, dc->categories); vdc->init = virtio_rng_device_init; + vdc->exit = virtio_rng_device_exit; vdc->get_features = get_features; } |