[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/56] hw/misc/macio: Realize IDE controller before accessing it
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 24/56] hw/misc/macio: Realize IDE controller before accessing it |
Date: |
Thu, 15 Feb 2024 18:57:18 +0100 |
We should not wire IRQs on unrealized device.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240213130341.1793-7-philmd@linaro.org>
---
hw/misc/macio/macio.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index c9f22f8515..3f449f91c0 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -123,14 +123,17 @@ static bool macio_realize_ide(MacIOState *s,
MACIOIDEState *ide,
{
SysBusDevice *sbd = SYS_BUS_DEVICE(ide);
- sysbus_connect_irq(sbd, 0, irq0);
- sysbus_connect_irq(sbd, 1, irq1);
qdev_prop_set_uint32(DEVICE(ide), "channel", dmaid);
object_property_set_link(OBJECT(ide), "dbdma", OBJECT(&s->dbdma),
&error_abort);
macio_ide_register_dma(ide);
+ if (!qdev_realize(DEVICE(ide), BUS(&s->macio_bus), errp)) {
+ return false;
+ }
+ sysbus_connect_irq(sbd, 0, irq0);
+ sysbus_connect_irq(sbd, 1, irq1);
- return qdev_realize(DEVICE(ide), BUS(&s->macio_bus), errp);
+ return true;
}
static void macio_oldworld_realize(PCIDevice *d, Error **errp)
--
2.41.0
- [PULL 15/56] hw/isa: clean up Kconfig selections for ISA_SUPERIO, (continued)
- [PULL 15/56] hw/isa: clean up Kconfig selections for ISA_SUPERIO, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 13/56] target/mips: Remove CPUMIPSState::CP0_SAARI field, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 14/56] target/mips: Remove the unused DisasContext::saar field, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 17/56] hw/isa: fix ISA_SUPERIO dependencies, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 18/56] hw/isa: specify instance_size in isa_superio_type_info, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 19/56] hw/isa: extract FDC37M81X to a separate file, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 20/56] hw/rx/rx62n: Reduce inclusion of 'qemu/units.h', Philippe Mathieu-Daudé, 2024/02/15
- [PULL 21/56] hw/rx/rx62n: Only call qdev_get_gpio_in() when necessary, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 23/56] hw/ppc/prep: Realize ISA bridge before accessing it, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 22/56] hw/i386/q35: Realize LPC PCI function before accessing it, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 24/56] hw/misc/macio: Realize IDE controller before accessing it,
Philippe Mathieu-Daudé <=
- [PULL 25/56] hw/sh4/r2d: Realize IDE controller before accessing it, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 26/56] hw/dma: Pass parent object to i8257_dma_init(), Philippe Mathieu-Daudé, 2024/02/15
- [PULL 27/56] hw/sparc/sun4m: Realize DMA controller before accessing it, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 28/56] hw/sparc64/cpu: Initialize GPIO before realizing CPU devices, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 29/56] target/sparc: Provide hint about CPUSPARCState::irq_manager member, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 31/56] hw/sparc/leon3: Remove unused 'env' argument of write_bootloader(), Philippe Mathieu-Daudé, 2024/02/15
- [PULL 30/56] hw/sparc/leon3: Remove duplicate code, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 32/56] hw/sparc/leon3: Have write_bootloader() take a void pointer argument, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 34/56] hw/intc/grlib_irqmp: add ncpus property, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 33/56] hw/sparc/grlib: split out the headers for each peripherals, Philippe Mathieu-Daudé, 2024/02/15