[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/12] virtio-rng: fix virtio-rng child refcount
From: |
arei.gonglei |
Subject: |
[Qemu-devel] [PATCH v3 08/12] virtio-rng: fix virtio-rng child refcount in transports |
Date: |
Tue, 30 Sep 2014 17:49:40 +0800 |
From: Gonglei <address@hidden>
object_initialize() leaves the object with a refcount of 1.
object_property_add_child() adds its own reference which is dropped
again when the property is deleted.
The upshot of this is that we always have a refcount >= 1. Upon hot
unplug the virtio-rng child is not finalized!
Drop our reference after the child property has been added to the
parent.
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-bus.c | 1 +
hw/s390x/virtio-ccw.c | 1 +
hw/virtio/virtio-pci.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 6d0a7f3..ca682bb 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -312,6 +312,7 @@ static void s390_virtio_rng_instance_init(Object *obj)
object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_RNG);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
qdev_alias_all_properties(DEVICE(&dev->vdev), obj);
+ object_unref(OBJECT(&dev->vdev));
object_property_add_link(obj, "rng", TYPE_RNG_BACKEND,
(Object **)&dev->vdev.conf.rng,
qdev_prop_allow_set_link_before_realize,
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index da2e427..de0764d 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -1543,6 +1543,7 @@ static void virtio_ccw_rng_instance_init(Object *obj)
object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_RNG);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
qdev_alias_all_properties(DEVICE(&dev->vdev), obj);
+ object_unref(OBJECT(&dev->vdev));
object_property_add_link(obj, "rng", TYPE_RNG_BACKEND,
(Object **)&dev->vdev.conf.rng,
qdev_prop_allow_set_link_before_realize,
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 2b3a941..40652a7 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1525,6 +1525,7 @@ static void virtio_rng_initfn(Object *obj)
object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_RNG);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
qdev_alias_all_properties(DEVICE(&dev->vdev), obj);
+ object_unref(OBJECT(&dev->vdev));
object_property_add_link(obj, "rng", TYPE_RNG_BACKEND,
(Object **)&dev->vdev.conf.rng,
qdev_prop_allow_set_link_before_realize,
--
1.7.12.4
- [Qemu-devel] [PATCH v3 01/12] virtio-net: use aliases instead of duplicate qdev properties, (continued)
- [Qemu-devel] [PATCH v3 01/12] virtio-net: use aliases instead of duplicate qdev properties, arei.gonglei, 2014/09/30
- [Qemu-devel] [PATCH v3 04/12] virtio/vhost-scsi: fix virtio-scsi/vhost-scsi child refcount in transports, arei.gonglei, 2014/09/30
- [Qemu-devel] [PATCH v3 05/12] virtio-serial: use aliases instead of duplicate qdev properties, arei.gonglei, 2014/09/30
- [Qemu-devel] [PATCH v3 03/12] virtio/vhost-scsi: use aliases instead of duplicate qdev properties, arei.gonglei, 2014/09/30
- [Qemu-devel] [PATCH v3 02/12] virtio-net: fix virtio-net child refcount in transports, arei.gonglei, 2014/09/30
- [Qemu-devel] [PATCH v3 09/12] virtio-balloon: fix virtio-balloon child refcount in transports, arei.gonglei, 2014/09/30
- [Qemu-devel] [PATCH v3 07/12] virtio-rng: use aliases instead of duplicate qdev properties, arei.gonglei, 2014/09/30
- [Qemu-devel] [PATCH v3 10/12] virtio-9p: use aliases instead of duplicate qdev properties, arei.gonglei, 2014/09/30
- [Qemu-devel] [PATCH v3 11/12] virtio-9p: fix virtio-9p child refcount in transports, arei.gonglei, 2014/09/30
- [Qemu-devel] [PATCH v3 08/12] virtio-rng: fix virtio-rng child refcount in transports,
arei.gonglei <=
- [Qemu-devel] [PATCH v3 06/12] virtio-serial: fix virtio-serial child refcount in transports, arei.gonglei, 2014/09/30
- [Qemu-devel] [PATCH v3 12/12] virtio: add a wrapper for virtio-backend initialization, arei.gonglei, 2014/09/30
- Re: [Qemu-devel] [PATCH v3 00/12] virtio: fix virtio child recount in transports, Michael S. Tsirkin, 2014/09/30