[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/37] hw/dma/xlnx_csu_dma: Run trivial checks early in realize()
|
From: |
Peter Maydell |
|
Subject: |
[PULL 02/37] hw/dma/xlnx_csu_dma: Run trivial checks early in realize() |
|
Date: |
Thu, 26 Aug 2021 18:02:32 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
If some property are not set, we'll return indicating a failure,
so it is pointless to allocate / initialize some fields too early.
Move the trivial checks earlier in realize().
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20210819163422.2863447-3-philmd@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/dma/xlnx_csu_dma.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
index 797b4fed8f5..2d19f415ef3 100644
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@@ -626,6 +626,11 @@ static void xlnx_csu_dma_realize(DeviceState *dev, Error
**errp)
XlnxCSUDMA *s = XLNX_CSU_DMA(dev);
RegisterInfoArray *reg_array;
+ if (!s->is_dst && !s->tx_dev) {
+ error_setg(errp, "zynqmp.csu-dma: Stream not connected");
+ return;
+ }
+
reg_array =
register_init_block32(dev, xlnx_csu_dma_regs_info[!!s->is_dst],
XLNX_CSU_DMA_R_MAX,
@@ -640,11 +645,6 @@ static void xlnx_csu_dma_realize(DeviceState *dev, Error
**errp)
sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem);
sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq);
- if (!s->is_dst && !s->tx_dev) {
- error_setg(errp, "zynqmp.csu-dma: Stream not connected");
- return;
- }
-
s->src_timer = ptimer_init(xlnx_csu_dma_src_timeout_hit,
s, PTIMER_POLICY_DEFAULT);
--
2.20.1
- [PULL 00/37] target-arm queue, Peter Maydell, 2021/08/26
- [PULL 02/37] hw/dma/xlnx_csu_dma: Run trivial checks early in realize(),
Peter Maydell <=
- [PULL 01/37] hw/arm/xlnx-zynqmp: Realize qspi controller *after* qspi_dma, Peter Maydell, 2021/08/26
- [PULL 03/37] hw/dma/xlnx_csu_dma: Always expect 'dma' link property to be set, Peter Maydell, 2021/08/26
- [PULL 05/37] hw/arm/Kconfig: no need to enable ACPI_MEMORY_HOTPLUG/ACPI_NVDIMM explicitly, Peter Maydell, 2021/08/26
- [PULL 07/37] target/arm/kvm64: Ensure sve vls map is completely clear, Peter Maydell, 2021/08/26
- [PULL 04/37] hw/dma/xlnx-zdma Always expect 'dma' link property to be set, Peter Maydell, 2021/08/26
- [PULL 08/37] target/arm/cpu64: Replace kvm_supported with sve_vq_supported, Peter Maydell, 2021/08/26
- [PULL 06/37] target/arm/cpu: Introduce sve_vq_supported bitmap, Peter Maydell, 2021/08/26
- [PULL 09/37] target/arm/cpu64: Validate sve vector lengths are supported, Peter Maydell, 2021/08/26
- [PULL 10/37] docs/specs/acpu_cpu_hotplug: Convert to rST, Peter Maydell, 2021/08/26
- [PULL 15/37] softmmu: Use accel_find("xen") instead of xen_available(), Peter Maydell, 2021/08/26