motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/misc/macio: Realize IDE controller before accessing it

Browse source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-19 11:57:59 +02:00
parent 59ae6bcddc
commit fc432ba0f5
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hw/misc/macio/macio.c
View file

@ -123,14 +123,17 @@ static bool macio_realize_ide(MacIOState *s, MACIOIDEState *ide,
{ {
SysBusDevice *sbd = SYS_BUS_DEVICE(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); qdev_prop_set_uint32(DEVICE(ide), "channel", dmaid);
object_property_set_link(OBJECT(ide), "dbdma", OBJECT(&s->dbdma), object_property_set_link(OBJECT(ide), "dbdma", OBJECT(&s->dbdma),
&error_abort); &error_abort);
macio_ide_register_dma(ide); 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) static void macio_oldworld_realize(PCIDevice *d, Error **errp)