[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/57] hw/virtio/virtio-balloon: move adding property
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 01/57] hw/virtio/virtio-balloon: move adding property to virtio_balloon_instance_init |
Date: |
Sun, 31 May 2015 20:34:20 +0200 |
From: Shannon Zhao <address@hidden>
This is in preparation for using alias property in virtio-balloon-pci
and virtio-balloon-ccw.
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
hw/virtio/virtio-balloon.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 484c3c3..cfff542 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -396,14 +396,6 @@ static void virtio_balloon_device_realize(DeviceState
*dev, Error **errp)
register_savevm(dev, "virtio-balloon", -1, 1,
virtio_balloon_save, virtio_balloon_load, s);
-
- object_property_add(OBJECT(dev), "guest-stats", "guest statistics",
- balloon_stats_get_all, NULL, NULL, s, NULL);
-
- object_property_add(OBJECT(dev), "guest-stats-polling-interval", "int",
- balloon_stats_get_poll_interval,
- balloon_stats_set_poll_interval,
- NULL, s, NULL);
}
static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp)
@@ -417,6 +409,19 @@ static void virtio_balloon_device_unrealize(DeviceState
*dev, Error **errp)
virtio_cleanup(vdev);
}
+static void virtio_balloon_instance_init(Object *obj)
+{
+ VirtIOBalloon *s = VIRTIO_BALLOON(obj);
+
+ object_property_add(obj, "guest-stats", "guest statistics",
+ balloon_stats_get_all, NULL, NULL, s, NULL);
+
+ object_property_add(obj, "guest-stats-polling-interval", "int",
+ balloon_stats_get_poll_interval,
+ balloon_stats_set_poll_interval,
+ NULL, s, NULL);
+}
+
static Property virtio_balloon_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
@@ -441,6 +446,7 @@ static const TypeInfo virtio_balloon_info = {
.name = TYPE_VIRTIO_BALLOON,
.parent = TYPE_VIRTIO_DEVICE,
.instance_size = sizeof(VirtIOBalloon),
+ .instance_init = virtio_balloon_instance_init,
.class_init = virtio_balloon_class_init,
};
--
MST
- [Qemu-devel] [PULL 00/57] pc, pci, tpm, virtio enhancements and fixes, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 01/57] hw/virtio/virtio-balloon: move adding property to virtio_balloon_instance_init,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 02/57] hw/virtio/virtio-pci: use alias property for virtio-balloon-pci, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 03/57] hw/s390x/virtio-ccw: use alias property for virtio-balloon-ccw, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 04/57] pc: Replace tab with spaces, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 05/57] hw: Move commas inside HW_COMPAT_2_1 macro, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 06/57] pc: Move commas inside PC_COMPAT_* macros, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 07/57] spapr: Move commas inside SPAPR_COMPAT_* macros, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 08/57] hw: Define empty HW_COMPAT_2_[23] macros, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 09/57] pc: Define PC_COMPAT_2_[123] macros, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 10/57] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 11/57] spapr: define SPAPR_COMPAT_2_3, Michael S. Tsirkin, 2015/05/31