[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] sparc32_dma: use object link instead of qdev pr
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCH 6/8] sparc32_dma: use object link instead of qdev property to pass IOMMU reference |
Date: |
Mon, 9 Oct 2017 22:07:01 +0100 |
This enables us to remove the last remaining (opaque) qdev property. Whilst we
are here, also update iommu_init() to use TYPE_SUN4M_IOMMU instead of a
hardcoded string.
Signed-off-by: Mark Cave-Ayland <address@hidden>
---
hw/dma/sparc32_dma.c | 13 +++++--------
hw/sparc/sun4m.c | 4 ++--
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index db70192..b817472 100644
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -263,24 +263,21 @@ static void sparc32_dma_device_init(Object *obj)
sysbus_init_mmio(sbd, &s->iomem);
+ object_property_add_link(OBJECT(dev), "iommu", TYPE_SUN4M_IOMMU,
+ (Object **) &s->iommu,
+ qdev_prop_allow_set_link_before_realize,
+ 0, NULL);
+
qdev_init_gpio_in(dev, dma_set_irq, 1);
qdev_init_gpio_out(dev, s->gpio, 2);
}
-static Property sparc32_dma_device_properties[] = {
- DEFINE_PROP_PTR("iommu_opaque", DMADeviceState, iommu),
- DEFINE_PROP_END_OF_LIST(),
-};
-
static void sparc32_dma_device_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
dc->reset = sparc32_dma_device_reset;
dc->vmsd = &vmstate_sparc32_dma_device;
- dc->props = sparc32_dma_device_properties;
- /* Reason: pointer property "iommu_opaque" */
- dc->user_creatable = false;
}
static const TypeInfo sparc32_dma_device_info = {
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 4f2ed4b..12d36b5 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -297,7 +297,7 @@ static void *iommu_init(hwaddr addr, uint32_t version,
qemu_irq irq)
DeviceState *dev;
SysBusDevice *s;
- dev = qdev_create(NULL, "iommu");
+ dev = qdev_create(NULL, TYPE_SUN4M_IOMMU);
qdev_prop_set_uint32(dev, "version", version);
qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev);
@@ -313,7 +313,7 @@ static void *sparc32_dma_init(hwaddr daddr, void *iommu,
int is_ledma)
SysBusDevice *s;
dev = qdev_create(NULL, is_ledma ? "sparc32-ledma" : "sparc32-espdma");
- qdev_prop_set_ptr(dev, "iommu_opaque", iommu);
+ object_property_set_link(OBJECT(dev), OBJECT(iommu), "iommu",
&error_abort);
qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev);
sysbus_mmio_map(s, 0, daddr);
--
1.7.10.4
- [Qemu-devel] [PATCH 0/8] sun4m : sparc32_dma tidy-ups, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 2/8] sparc32_dma: split esp and le into separate DMA devices, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 3/8] sparc32_dma: move type declarations from sparc32_dma.c to sparc32_dma.h, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 4/8] sun4m: move DMA device wiring from sparc32_dma_init() to sun4m_hw_init(), Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 1/8] sparc32_dma: rename SPARC32_DMA type to SPARC32_DMA_DEVICE, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 7/8] sparc32_dma: introduce new SPARC32_DMA type container object, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 8/8] sparc32_dma: remove is_ledma hack and replace with memory region alias, Mark Cave-Ayland, 2017/10/09
- [Qemu-devel] [PATCH 6/8] sparc32_dma: use object link instead of qdev property to pass IOMMU reference,
Mark Cave-Ayland <=
- [Qemu-devel] [PATCH 5/8] sun4m_iommu: move TYPE_SUN4M_IOMMU declaration to sun4m.h, Mark Cave-Ayland, 2017/10/09
- Re: [Qemu-devel] [PATCH 0/8] sun4m : sparc32_dma tidy-ups, no-reply, 2017/10/09
- Re: [Qemu-devel] [PATCH 0/8] sun4m : sparc32_dma tidy-ups, Artyom Tarasenko, 2017/10/10