From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDjBD-0004LM-06 for qemu-devel@nongnu.org; Wed, 12 Feb 2014 18:25:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDjB6-00026g-QO for qemu-devel@nongnu.org; Wed, 12 Feb 2014 18:25:22 -0500 Received: from mail-qc0-f174.google.com ([209.85.216.174]:50480) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDjB6-00026W-Na for qemu-devel@nongnu.org; Wed, 12 Feb 2014 18:25:16 -0500 Received: by mail-qc0-f174.google.com with SMTP id x13so16690515qcv.33 for ; Wed, 12 Feb 2014 15:25:16 -0800 (PST) Sender: Peter Crosthwaite From: Peter Crosthwaite Date: Wed, 12 Feb 2014 15:24:43 -0800 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [PATCH microblaze/ppc v2 4/8] xilinx: Inline usages of xilinx_intc_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com Cc: agraf@suse.de Inline these usages. Converts these init to at least a semi-recent QOM styling. Signed-off-by: Peter Crosthwaite --- hw/microblaze/petalogix_ml605_mmu.c | 8 ++++++-- hw/microblaze/petalogix_s3adsp1800_mmu.c | 9 +++++++-- hw/ppc/virtex_ml507.c | 6 +++++- include/hw/xilinx.h | 13 ------------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 48a0a3e..0dee46c 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -119,8 +119,12 @@ petalogix_ml605_init(QEMUMachineInitArgs *args) 2, 0x89, 0x18, 0x0000, 0x0, 0); - dev = xilinx_intc_create(INTC_BASEADDR, qdev_get_gpio_in(DEVICE(cpu), - MB_CPU_IRQ), 4); + dev = qdev_create(NULL, "xlnx.xps-intc"); + qdev_prop_set_uint32(dev, "kind-of-intr", 1 << TIMER_IRQ); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, + qdev_get_gpio_in(DEVICE(cpu), MB_CPU_IRQ)); for (i = 0; i < 32; i++) { irq[i] = qdev_get_gpio_in(dev, i); } diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index a4877a6..cb8e334 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -97,8 +97,13 @@ petalogix_s3adsp1800_init(QEMUMachineInitArgs *args) FLASH_SIZE >> 16, 1, 0x89, 0x18, 0x0000, 0x0, 1); - dev = xilinx_intc_create(INTC_BASEADDR, qdev_get_gpio_in(DEVICE(cpu), - MB_CPU_IRQ), 0xA); + dev = qdev_create(NULL, "xlnx.xps-intc"); + qdev_prop_set_uint32(dev, "kind-of-intr", + 1 << ETHLITE_IRQ | 1 << UARTLITE_IRQ); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, + qdev_get_gpio_in(DEVICE(cpu), MB_CPU_IRQ)); for (i = 0; i < 32; i++) { irq[i] = qdev_get_gpio_in(dev, i); } 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); } diff --git a/include/hw/xilinx.h b/include/hw/xilinx.h index 9d6debe..02400cd 100644 --- a/include/hw/xilinx.h +++ b/include/hw/xilinx.h @@ -7,19 +7,6 @@ #include "hw/stream.h" #include "net/net.h" -static inline DeviceState * -xilinx_intc_create(hwaddr base, qemu_irq irq, int kind_of_intr) -{ - DeviceState *dev; - - dev = qdev_create(NULL, "xlnx.xps-intc"); - qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr); - qdev_init_nofail(dev); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); - return dev; -} - /* OPB Timer/Counter. */ static inline DeviceState * xilinx_timer_create(hwaddr base, qemu_irq irq, int oto, int freq) -- 1.8.5.4