[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/14] hw/arm/highbank: Don't use arm_pic_init_cpu()
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 04/14] hw/arm/highbank: Don't use arm_pic_init_cpu() |
Date: |
Thu, 8 Aug 2013 17:04:06 +0100 |
Drop the now-deprecated arm_pic_init_cpu() in favour of directly
getting the IRQ line from the ARMCPU object.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/highbank.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 35d5511..f733a6c 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -209,7 +209,6 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum
cxmachines machine)
const char *initrd_filename = args->initrd_filename;
DeviceState *dev = NULL;
SysBusDevice *busdev;
- qemu_irq *irqp;
qemu_irq pic[128];
int n;
qemu_irq cpu_irq[4];
@@ -239,8 +238,7 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum
cxmachines machine)
/* This will become a QOM property eventually */
cpu->reset_cbar = GIC_BASE_ADDR;
- irqp = arm_pic_init_cpu(cpu);
- cpu_irq[n] = irqp[ARM_PIC_CPU_IRQ];
+ cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ);
}
sysmem = get_system_memory();
--
1.7.9.5
- [Qemu-devel] [PATCH 00/14] ARM: make IRQ/FIQ gpio lines on CPU object, Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 14/14] hw/arm/pic_cpu: Remove the now-unneeded arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 13/14] hw/arm/xilinx_zynq: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 11/14] hw/arm/versatilepb: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 06/14] hw/arm/kzm: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 10/14] hw/arm/strongarm: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 03/14] hw/arm/exynos4210: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 05/14] hw/arm/integratorcp: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 04/14] hw/arm/highbank: Don't use arm_pic_init_cpu(),
Peter Maydell <=
- [Qemu-devel] [PATCH 01/14] target-arm: Make IRQ and FIQ gpio lines on the CPU object, Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 02/14] hw/arm/armv7m: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 09/14] hw/arm/realview: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 08/14] hw/arm/omap*: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 07/14] hw/arm/musicpal: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 12/14] hw/arm/vexpress: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- Re: [Qemu-devel] [PATCH 00/14] ARM: make IRQ/FIQ gpio lines on CPU object, Peter Maydell, 2013/08/20