SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sparc32-dma: use object_initialize_child() for espdma and ledma child objects

Browse Source 
Store the child objects directly within the sparc32-dma object rather than using
link properties.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200926140216.7368-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2020-09-26 15:02:11 +01:00
parent cfc1105649
commit 1f10fd53cb
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/dma/sparc32_dma.c
View File

@ -379,10 +379,9 @@ static void sparc32_dma_realize(DeviceState *dev, Error **errp)
return; return;
} }
espdma = qdev_new(TYPE_SPARC32_ESPDMA_DEVICE); espdma = DEVICE(&s->espdma);
object_property_set_link(OBJECT(espdma), "iommu", iommu, &error_abort); object_property_set_link(OBJECT(espdma), "iommu", iommu, &error_abort);
object_property_add_child(OBJECT(s), "espdma", OBJECT(espdma)); sysbus_realize(SYS_BUS_DEVICE(espdma), &error_fatal);
sysbus_realize_and_unref(SYS_BUS_DEVICE(espdma), &error_fatal);
esp = DEVICE(object_resolve_path_component(OBJECT(espdma), "esp")); esp = DEVICE(object_resolve_path_component(OBJECT(espdma), "esp"));
sbd = SYS_BUS_DEVICE(esp); sbd = SYS_BUS_DEVICE(esp);
@ -394,10 +393,9 @@ static void sparc32_dma_realize(DeviceState *dev, Error **errp)
memory_region_add_subregion(&s->dmamem, 0x0, memory_region_add_subregion(&s->dmamem, 0x0,
sysbus_mmio_get_region(sbd, 0)); sysbus_mmio_get_region(sbd, 0));
ledma = qdev_new(TYPE_SPARC32_LEDMA_DEVICE); ledma = DEVICE(&s->ledma);
object_property_set_link(OBJECT(ledma), "iommu", iommu, &error_abort); object_property_set_link(OBJECT(ledma), "iommu", iommu, &error_abort);
object_property_add_child(OBJECT(s), "ledma", OBJECT(ledma)); sysbus_realize(SYS_BUS_DEVICE(ledma), &error_fatal);
sysbus_realize_and_unref(SYS_BUS_DEVICE(ledma), &error_fatal);
lance = DEVICE(object_resolve_path_component(OBJECT(ledma), "lance")); lance = DEVICE(object_resolve_path_component(OBJECT(ledma), "lance"));
sbd = SYS_BUS_DEVICE(lance); sbd = SYS_BUS_DEVICE(lance);
@ -421,6 +419,11 @@ static void sparc32_dma_init(Object *obj)
memory_region_init(&s->dmamem, OBJECT(s), "dma", DMA_SIZE + DMA_ETH_SIZE); memory_region_init(&s->dmamem, OBJECT(s), "dma", DMA_SIZE + DMA_ETH_SIZE);
sysbus_init_mmio(sbd, &s->dmamem); sysbus_init_mmio(sbd, &s->dmamem);
object_initialize_child(obj, "espdma", &s->espdma,
TYPE_SPARC32_ESPDMA_DEVICE);
object_initialize_child(obj, "ledma", &s->ledma,
TYPE_SPARC32_LEDMA_DEVICE);
} }
static void sparc32_dma_class_init(ObjectClass *klass, void *data) static void sparc32_dma_class_init(ObjectClass *klass, void *data)

4
include/hw/sparc/sparc32_dma.h
View File

@ -48,8 +48,8 @@ struct SPARC32DMAState {
MemoryRegion dmamem; MemoryRegion dmamem;
MemoryRegion ledma_alias; MemoryRegion ledma_alias;
ESPDMADeviceState *espdma; ESPDMADeviceState espdma;
LEDMADeviceState *ledma; LEDMADeviceState ledma;
}; };
/* sparc32_dma.c */ /* sparc32_dma.c */