diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-31 09:48:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-31 09:48:20 +0000 |
| commit | 69d7eab0b8bb14f8d52539618ae33918032eaaf7 (patch) | |
| tree | a278e524e563b266a19aed4af2b43b2ba51ee222 /include | |
| parent | c3dee4de9252ec6f675603e460f9a668f1b5ec1b (diff) | |
| parent | 0980307e705b5677d9b4158a0a0346abf5041f33 (diff) | |
| download | qemu-69d7eab0b8bb14f8d52539618ae33918032eaaf7.zip qemu-69d7eab0b8bb14f8d52539618ae33918032eaaf7.tar.gz qemu-69d7eab0b8bb14f8d52539618ae33918032eaaf7.tar.bz2 | |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20201028' into staging
qemu-sparc queue
# gpg: Signature made Wed 28 Oct 2020 08:17:23 GMT
# gpg: using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg: issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" [full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* remotes/mcayland/tags/qemu-sparc-20201028:
hw/pci-host/sabre: Simplify code initializing variable once
hw/pci-host/sabre: Remove superfluous address range check
hw/pci-host/sabre: Update documentation link
sabre: increase number of PCI bus IRQs from 32 to 64
hw/display/tcx: Allow 64-bit accesses to framebuffer stippler and blitter
sabre: don't call sysbus_mmio_map() in sabre_realize()
sparc32-ledma: don't reference nd_table directly within the device
sparc32-espdma: use object_initialize_child() for esp child object
sparc32-ledma: use object_initialize_child() for lance child object
sparc32-dma: use object_initialize_child() for espdma and ledma child objects
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/sparc/sparc32_dma.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/hw/sparc/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h index e650489..cde8ec0 100644 --- a/include/hw/sparc/sparc32_dma.h +++ b/include/hw/sparc/sparc32_dma.h @@ -28,7 +28,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(ESPDMADeviceState, SPARC32_ESPDMA_DEVICE) struct ESPDMADeviceState { DMADeviceState parent_obj; - SysBusESPState *esp; + SysBusESPState esp; }; #define TYPE_SPARC32_LEDMA_DEVICE "sparc32-ledma" @@ -37,7 +37,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(LEDMADeviceState, SPARC32_LEDMA_DEVICE) struct LEDMADeviceState { DMADeviceState parent_obj; - SysBusPCNetState *lance; + SysBusPCNetState lance; }; #define TYPE_SPARC32_DMA "sparc32-dma" @@ -48,8 +48,8 @@ struct SPARC32DMAState { MemoryRegion dmamem; MemoryRegion ledma_alias; - ESPDMADeviceState *espdma; - LEDMADeviceState *ledma; + ESPDMADeviceState espdma; + LEDMADeviceState ledma; }; /* sparc32_dma.c */ |