mirror of
https://github.com/xemu-project/xemu.git
synced 2025-02-05 11:39:54 +00:00
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
This commit is contained in:
parent
437f0f10a4
commit
033ee5a5ac
@ -56,7 +56,6 @@ static void realview_init(QEMUMachineInitArgs *args,
|
|||||||
MemoryRegion *ram_hack = g_new(MemoryRegion, 1);
|
MemoryRegion *ram_hack = g_new(MemoryRegion, 1);
|
||||||
DeviceState *dev, *sysctl, *gpio2, *pl041;
|
DeviceState *dev, *sysctl, *gpio2, *pl041;
|
||||||
SysBusDevice *busdev;
|
SysBusDevice *busdev;
|
||||||
qemu_irq *irqp;
|
|
||||||
qemu_irq pic[64];
|
qemu_irq pic[64];
|
||||||
qemu_irq mmc_irq[2];
|
qemu_irq mmc_irq[2];
|
||||||
PCIBus *pci_bus = NULL;
|
PCIBus *pci_bus = NULL;
|
||||||
@ -92,8 +91,7 @@ static void realview_init(QEMUMachineInitArgs *args,
|
|||||||
fprintf(stderr, "Unable to find CPU definition\n");
|
fprintf(stderr, "Unable to find CPU definition\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
irqp = arm_pic_init_cpu(cpu);
|
cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ);
|
||||||
cpu_irq[n] = irqp[ARM_PIC_CPU_IRQ];
|
|
||||||
}
|
}
|
||||||
env = &cpu->env;
|
env = &cpu->env;
|
||||||
if (arm_feature(env, ARM_FEATURE_V7)) {
|
if (arm_feature(env, ARM_FEATURE_V7)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user