[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/39] virtio-rng: use aliases instead of duplicate q
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 16/39] virtio-rng: use aliases instead of duplicate qdev properties |
Date: |
Tue, 30 Sep 2014 14:24:56 +0200 |
From: Gonglei <address@hidden>
virtio-rng-{pci, s390, ccw} all duplicate the
qdev properties of their VirtIORNG child.
This approach does not work well with string or pointer
properties since we must be careful about leaking or
double-freeing them.
Use the QOM alias property to forward property accesses to the
VirtIORNG child. This way no duplication is necessary.
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/s390x/s390-virtio-bus.c | 2 +-
hw/s390x/virtio-ccw.c | 2 +-
hw/virtio/virtio-pci.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 422402e..6d0a7f3 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -311,6 +311,7 @@ static void s390_virtio_rng_instance_init(Object *obj)
VirtIORNGS390 *dev = VIRTIO_RNG_S390(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_property_add_link(obj, "rng", TYPE_RNG_BACKEND,
(Object **)&dev->vdev.conf.rng,
qdev_prop_allow_set_link_before_realize,
@@ -561,7 +562,6 @@ static const TypeInfo s390_virtio_serial = {
static Property s390_virtio_rng_properties[] = {
DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),
- DEFINE_VIRTIO_RNG_PROPERTIES(VirtIORNGS390, vdev.conf),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 5d7f3a6..da2e427 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -1542,6 +1542,7 @@ static void virtio_ccw_rng_instance_init(Object *obj)
VirtIORNGCcw *dev = VIRTIO_RNG_CCW(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_property_add_link(obj, "rng", TYPE_RNG_BACKEND,
(Object **)&dev->vdev.conf.rng,
qdev_prop_allow_set_link_before_realize,
@@ -1550,7 +1551,6 @@ static void virtio_ccw_rng_instance_init(Object *obj)
static Property virtio_ccw_rng_properties[] = {
DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
- DEFINE_VIRTIO_RNG_PROPERTIES(VirtIORNGCcw, vdev.conf),
DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,
VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),
DEFINE_PROP_END_OF_LIST(),
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 4446d79..2b3a941 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1483,7 +1483,6 @@ static const TypeInfo virtio_net_pci_info = {
/* virtio-rng-pci */
static Property virtio_rng_pci_properties[] = {
- DEFINE_VIRTIO_RNG_PROPERTIES(VirtIORngPCI, vdev.conf),
DEFINE_PROP_END_OF_LIST(),
};
@@ -1525,6 +1524,7 @@ static void virtio_rng_initfn(Object *obj)
VirtIORngPCI *dev = VIRTIO_RNG_PCI(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_property_add_link(obj, "rng", TYPE_RNG_BACKEND,
(Object **)&dev->vdev.conf.rng,
qdev_prop_allow_set_link_before_realize,
--
1.8.3.1
- [Qemu-devel] [PULL 06/39] virtio-scsi: Split virtio_scsi_handle_ctrl_req from virtio_scsi_handle_ctrl, (continued)
- [Qemu-devel] [PULL 06/39] virtio-scsi: Split virtio_scsi_handle_ctrl_req from virtio_scsi_handle_ctrl, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 05/39] virtio-scsi: Split virtio_scsi_handle_cmd_req from virtio_scsi_handle_cmd, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 11/39] virtio-net: fix virtio-net child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 12/39] virtio/vhost-scsi: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 13/39] virtio/vhost-scsi: fix virtio-scsi/vhost-scsi child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 08/39] virtio-scsi: Make virtio_scsi_free_req public, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 07/39] virtio-scsi: Make virtio_scsi_init_req public, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 09/39] virtio-scsi: Make virtio_scsi_push_event public, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 14/39] virtio-serial: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 15/39] virtio-serial: fix virtio-serial child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 16/39] virtio-rng: use aliases instead of duplicate qdev properties,
Paolo Bonzini <=
- [Qemu-devel] [PULL 17/39] virtio-rng: fix virtio-rng child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 18/39] virtio-balloon: fix virtio-balloon child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 19/39] virtio-9p: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 20/39] virtio-9p: fix virtio-9p child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 21/39] virtio: add a wrapper for virtio-backend initialization, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 23/39] virtio-scsi: Add VirtIOSCSIVring in VirtIOSCSIReq, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 22/39] virtio-scsi: Add 'iothread' property to virtio-scsi, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 24/39] virtio-scsi-dataplane: Code to run virtio-scsi on iothread, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 25/39] virtio-scsi: Hook up with dataplane, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 26/39] virtio-scsi: Add migration state notifier for dataplane code, Paolo Bonzini, 2014/09/30