From 13c9bfbfbb3e20d5b58c7760d3338e7a3948ecd8 Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Tue, 25 Feb 2014 16:40:04 -0800 Subject: xilinx: Inline usages of xilinx_intc_create() Inline these usages. Converts these init to at least a semi-recent QOM styling. Signed-off-by: Peter Crosthwaite Signed-off-by: Edgar E. Iglesias --- hw/ppc/virtex_ml507.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'hw/ppc') diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 88312f8..1e2f532 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -218,7 +218,11 @@ static void virtex_init(QEMUMachineInitArgs *args) 1, 0x89, 0x18, 0x0000, 0x0, 1); cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT]; - dev = xilinx_intc_create(0x81800000, cpu_irq[0], 0); + dev = qdev_create(NULL, "xlnx.xps-intc"); + qdev_prop_set_uint32(dev, "kind-of-intr", 0); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irq[0]); for (i = 0; i < 32; i++) { irq[i] = qdev_get_gpio_in(dev, i); } -- cgit v1.1