[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/14] hw/arm/armv7m: Don't use arm_pic_init_cpu()
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 02/14] hw/arm/armv7m: Don't use arm_pic_init_cpu() |
Date: |
Thu, 8 Aug 2013 17:04:04 +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/armv7m.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 82d36fb..89a9015 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -173,7 +173,6 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
DeviceState *nvic;
/* FIXME: make this local state. */
static qemu_irq pic[64];
- qemu_irq *cpu_pic;
int image_size;
uint64_t entry;
uint64_t lowaddr;
@@ -221,8 +220,8 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
nvic = qdev_create(NULL, "armv7m_nvic");
env->nvic = nvic;
qdev_init_nofail(nvic);
- cpu_pic = arm_pic_init_cpu(cpu);
- sysbus_connect_irq(SYS_BUS_DEVICE(nvic), 0, cpu_pic[ARM_PIC_CPU_IRQ]);
+ sysbus_connect_irq(SYS_BUS_DEVICE(nvic), 0,
+ qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ));
for (i = 0; i < 64; i++) {
pic[i] = qdev_get_gpio_in(nvic, i);
}
--
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, 2013/08/08
- [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 <=
- [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