diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-08-20 14:54:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-08-20 14:54:29 +0100 |
| commit | 9188dbf71accf9d97f2e434380ea210ba75705ca (patch) | |
| tree | b31ae494e4a8eb783a6607ec678ef9b09e688381 /hw | |
| parent | ad666d91f43574fb200c738bc793023ae23d24a5 (diff) | |
| download | qemu-9188dbf71accf9d97f2e434380ea210ba75705ca.tar.gz qemu-9188dbf71accf9d97f2e434380ea210ba75705ca.tar.bz2 qemu-9188dbf71accf9d97f2e434380ea210ba75705ca.zip | |
hw/arm/highbank: 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-5-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/highbank.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 35d5511d28..f733a6cba7 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(); |