[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 26/30] virtio-balloon: Convert to QOM realize
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 26/30] virtio-balloon: Convert to QOM realize |
Date: |
Fri, 29 Nov 2013 11:17:38 +0100 |
From: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/virtio/virtio-balloon.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index e6f6b4b..755e188 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -337,9 +337,9 @@ static int virtio_balloon_load(QEMUFile *f, void *opaque,
int version_id)
return 0;
}
-static int virtio_balloon_device_init(VirtIODevice *vdev)
+static void virtio_balloon_device_realize(DeviceState *dev, Error **errp)
{
- DeviceState *dev = DEVICE(vdev);
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOBalloon *s = VIRTIO_BALLOON(dev);
int ret;
@@ -349,8 +349,9 @@ static int virtio_balloon_device_init(VirtIODevice *vdev)
virtio_balloon_stat, s);
if (ret < 0) {
+ error_setg(errp, "Adding balloon handler failed");
virtio_cleanup(vdev);
- return -1;
+ return;
}
s->ivq = virtio_add_queue(vdev, 128, virtio_balloon_handle_output);
@@ -367,7 +368,6 @@ static int virtio_balloon_device_init(VirtIODevice *vdev)
balloon_stats_get_poll_interval,
balloon_stats_set_poll_interval,
NULL, s, NULL);
- return 0;
}
static void virtio_balloon_device_exit(VirtIODevice *vdev)
@@ -388,9 +388,10 @@ static void virtio_balloon_class_init(ObjectClass *klass,
void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
+
dc->props = virtio_balloon_properties;
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
- vdc->init = virtio_balloon_device_init;
+ vdc->realize = virtio_balloon_device_realize;
vdc->exit = virtio_balloon_device_exit;
vdc->get_config = virtio_balloon_get_config;
vdc->set_config = virtio_balloon_set_config;
--
1.8.3.1
- [Qemu-devel] [PATCH 17/30] virtio-net: QOM realize preparations, (continued)
- [Qemu-devel] [PATCH 17/30] virtio-net: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 18/30] virtio-balloon: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 19/30] virtio-rng: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 20/30] virtio-scsi: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 21/30] virtio: Start converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 22/30] virtio-9p: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 23/30] virtio-blk: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 24/30] virtio-serial: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 25/30] virtio-net: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 26/30] virtio-balloon: Convert to QOM realize,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 27/30] virtio-rng: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 28/30] virtio-scsi: Convert to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 29/30] virtio: Complete converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 30/30] virtio: Convert exit to unrealize, Paolo Bonzini, 2013/11/29