summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-08-20 14:54:30 +0100
committerPeter Maydell <peter.maydell@linaro.org>2013-08-20 14:54:30 +0100
commit033ee5a5ac5dd01bcea76a6427d95f5390af43ca (patch)
tree4d0cd6f8397d52348a513952b0ca3a03a2f64204 /hw
parent437f0f10a42dc2a0236a79e0bba39a32af4d73f8 (diff)
downloadqemu-033ee5a5ac5dd01bcea76a6427d95f5390af43ca.tar.gz
qemu-033ee5a5ac5dd01bcea76a6427d95f5390af43ca.tar.bz2
qemu-033ee5a5ac5dd01bcea76a6427d95f5390af43ca.zip
hw/arm/realview: Don't use arm_pic_init_cpu()
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 <peter.maydell@linaro.org> Message-id: 1375977856-25046-10-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw')
-rw-r--r--hw/arm/realview.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 3060f48f77..82ec02d118 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -56,7 +56,6 @@ static void realview_init(QEMUMachineInitArgs *args,
MemoryRegion *ram_hack = g_new(MemoryRegion, 1);
DeviceState *dev, *sysctl, *gpio2, *pl041;
SysBusDevice *busdev;
- qemu_irq *irqp;
qemu_irq pic[64];
qemu_irq mmc_irq[2];
PCIBus *pci_bus = NULL;
@@ -92,8 +91,7 @@ static void realview_init(QEMUMachineInitArgs *args,
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
}
- 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);
}
env = &cpu->env;
if (arm_feature(env, ARM_FEATURE_V7)) {