|
 |
298366 |
From d42ac36363ef9e3d3963c2c31fa7122492dbaf0e Mon Sep 17 00:00:00 2001
|
|
|
298366 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
298366 |
Date: Fri, 20 Sep 2013 16:57:58 +0200
|
|
|
298366 |
Subject: [PATCH] virtio-balloon: switch exit callback to VirtioDeviceClass
|
|
|
298366 |
|
|
|
298366 |
This ensures hot-unplug is handled properly by the proxy.
|
|
|
298366 |
|
|
|
298366 |
Cc: qemu-stable@nongnu.org
|
|
|
298366 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
298366 |
---
|
|
|
298366 |
hw/virtio/virtio-balloon.c | 10 ++++------
|
|
|
298366 |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
298366 |
|
|
|
298366 |
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
|
|
|
298366 |
index aac7f83..c23facb 100644
|
|
|
298366 |
--- a/hw/virtio/virtio-balloon.c
|
|
|
298366 |
+++ b/hw/virtio/virtio-balloon.c
|
|
|
298366 |
@@ -370,16 +370,14 @@ static int virtio_balloon_device_init(VirtIODevice *vdev)
|
|
|
298366 |
return 0;
|
|
|
298366 |
}
|
|
|
298366 |
|
|
|
298366 |
-static int virtio_balloon_device_exit(DeviceState *qdev)
|
|
|
298366 |
+static void virtio_balloon_device_exit(VirtIODevice *vdev)
|
|
|
298366 |
{
|
|
|
298366 |
- VirtIOBalloon *s = VIRTIO_BALLOON(qdev);
|
|
|
298366 |
- VirtIODevice *vdev = VIRTIO_DEVICE(qdev);
|
|
|
298366 |
+ VirtIOBalloon *s = VIRTIO_BALLOON(vdev);
|
|
|
298366 |
|
|
|
298366 |
balloon_stats_destroy_timer(s);
|
|
|
298366 |
qemu_remove_balloon_handler(s);
|
|
|
298366 |
- unregister_savevm(qdev, "virtio-balloon", s);
|
|
|
298366 |
+ unregister_savevm(DEVICE(vdev), "virtio-balloon", s);
|
|
|
298366 |
virtio_cleanup(vdev);
|
|
|
298366 |
- return 0;
|
|
|
298366 |
}
|
|
|
298366 |
|
|
|
298366 |
static Property virtio_balloon_properties[] = {
|
|
|
298366 |
@@ -390,10 +388,10 @@ static void virtio_balloon_class_init(ObjectClass *klass, void *data)
|
|
|
298366 |
{
|
|
|
298366 |
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
298366 |
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
|
|
|
298366 |
- dc->exit = virtio_balloon_device_exit;
|
|
|
298366 |
dc->props = virtio_balloon_properties;
|
|
|
298366 |
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
|
298366 |
vdc->init = virtio_balloon_device_init;
|
|
|
298366 |
+ vdc->exit = virtio_balloon_device_exit;
|
|
|
298366 |
vdc->get_config = virtio_balloon_get_config;
|
|
|
298366 |
vdc->set_config = virtio_balloon_set_config;
|
|
|
298366 |
vdc->get_features = virtio_balloon_get_features;
|