[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 02/60] hw/virtio/virtio-pci: use alias property fo
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 02/60] hw/virtio/virtio-pci: use alias property for virtio-balloon-pci |
Date: |
Mon, 1 Jun 2015 14:22:30 +0200 |
From: Shannon Zhao <address@hidden>
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-pci.c | 40 ++++++----------------------------------
1 file changed, 6 insertions(+), 34 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 867c9d1..c931790 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1207,32 +1207,6 @@ static const TypeInfo vhost_scsi_pci_info = {
/* virtio-balloon-pci */
-static void balloon_pci_stats_get_all(Object *obj, struct Visitor *v,
- void *opaque, const char *name,
- Error **errp)
-{
- VirtIOBalloonPCI *dev = opaque;
- object_property_get(OBJECT(&dev->vdev), v, "guest-stats", errp);
-}
-
-static void balloon_pci_stats_get_poll_interval(Object *obj, struct Visitor *v,
- void *opaque, const char *name,
- Error **errp)
-{
- VirtIOBalloonPCI *dev = opaque;
- object_property_get(OBJECT(&dev->vdev), v, "guest-stats-polling-interval",
- errp);
-}
-
-static void balloon_pci_stats_set_poll_interval(Object *obj, struct Visitor *v,
- void *opaque, const char *name,
- Error **errp)
-{
- VirtIOBalloonPCI *dev = opaque;
- object_property_set(OBJECT(&dev->vdev), v, "guest-stats-polling-interval",
- errp);
-}
-
static Property virtio_balloon_pci_properties[] = {
DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
DEFINE_PROP_END_OF_LIST(),
@@ -1269,16 +1243,14 @@ static void virtio_balloon_pci_class_init(ObjectClass
*klass, void *data)
static void virtio_balloon_pci_instance_init(Object *obj)
{
VirtIOBalloonPCI *dev = VIRTIO_BALLOON_PCI(obj);
+
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
TYPE_VIRTIO_BALLOON);
- object_property_add(obj, "guest-stats", "guest statistics",
- balloon_pci_stats_get_all, NULL, NULL, dev,
- NULL);
-
- object_property_add(obj, "guest-stats-polling-interval", "int",
- balloon_pci_stats_get_poll_interval,
- balloon_pci_stats_set_poll_interval,
- NULL, dev, NULL);
+ object_property_add_alias(obj, "guest-stats", OBJECT(&dev->vdev),
+ "guest-stats", &error_abort);
+ object_property_add_alias(obj, "guest-stats-polling-interval",
+ OBJECT(&dev->vdev),
+ "guest-stats-polling-interval", &error_abort);
}
static const TypeInfo virtio_balloon_pci_info = {
--
MST
- [Qemu-devel] [PULL v2 00/60] pc, pci, tpm, virtio, vhost enhancements and fixes, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 01/60] hw/virtio/virtio-balloon: move adding property to virtio_balloon_instance_init, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 02/60] hw/virtio/virtio-pci: use alias property for virtio-balloon-pci,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 03/60] hw/s390x/virtio-ccw: use alias property for virtio-balloon-ccw, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 04/60] pc: Replace tab with spaces, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 05/60] hw: Move commas inside HW_COMPAT_2_1 macro, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 06/60] pc: Move commas inside PC_COMPAT_* macros, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 07/60] spapr: Move commas inside SPAPR_COMPAT_* macros, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 08/60] hw: Define empty HW_COMPAT_2_[23] macros, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 09/60] pc: Define PC_COMPAT_2_[123] macros, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 10/60] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 11/60] spapr: define SPAPR_COMPAT_2_3, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 13/60] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11, Michael S. Tsirkin, 2015/06/01