mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

balloon: call qdev_alias_all_properties for proxy dev in balloon class init

Browse Source 
The idea is that all other virtio devices are calling this helper
to merge properties of the proxy device. This is the only difference
in between this helper and code in inside virtio_instance_init_common.
The patch should not cause any harm as property list in generic balloon
code is empty.

This also allows to avoid some dummy errors like fixed by this
    commit 91ba212088
    Author: Gonglei <arei.gonglei@huawei.com>
    Date:   Tue Sep 30 14:10:35 2014 +0800
    virtio-balloon: fix virtio-balloon child refcount in transports

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Raushaniya Maksudova <rmaksudova@parallels.com>
Revieved-by: Cornelia Huck <cornelia.huck@de.ibm.com>
CC: Christian Borntraeger <borntraeger@de.ibm.com>
CC: Anthony Liguori <aliguori@amazon.com>
CC: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Denis V. Lunev 2015-01-29 17:24:41 +03:00 committed by Michael S. Tsirkin
parent dc33c02935
commit a6027b0f4b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/s390x/virtio-ccw.c
View File

@ -898,9 +898,8 @@ static void balloon_ccw_stats_set_poll_interval(Object *obj, struct Visitor *v,
static void virtio_ccw_balloon_instance_init(Object *obj) static void virtio_ccw_balloon_instance_init(Object *obj)
{ {
VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(obj); VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(obj);
object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_BALLOON); virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); TYPE_VIRTIO_BALLOON);
object_unref(OBJECT(&dev->vdev));
object_property_add(obj, "guest-stats", "guest statistics", object_property_add(obj, "guest-stats", "guest statistics",
balloon_ccw_stats_get_all, NULL, NULL, dev, NULL); balloon_ccw_stats_get_all, NULL, NULL, dev, NULL);

5
hw/virtio/virtio-pci.c
View File

@ -1274,9 +1274,8 @@ static void virtio_balloon_pci_class_init(ObjectClass *klass, void *data)
static void virtio_balloon_pci_instance_init(Object *obj) static void virtio_balloon_pci_instance_init(Object *obj)
{ {
VirtIOBalloonPCI *dev = VIRTIO_BALLOON_PCI(obj); VirtIOBalloonPCI *dev = VIRTIO_BALLOON_PCI(obj);
object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_BALLOON); virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); TYPE_VIRTIO_BALLOON);
object_unref(OBJECT(&dev->vdev));
object_property_add(obj, "guest-stats", "guest statistics", object_property_add(obj, "guest-stats", "guest statistics",
balloon_pci_stats_get_all, NULL, NULL, dev, balloon_pci_stats_get_all, NULL, NULL, dev,
NULL); NULL);