openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Peter Maydell 2013-08-20 14:54:29 +01:00
parent ad666d91f4
commit 9188dbf71a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/arm/highbank.c
View File

@ -209,7 +209,6 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum cxmachines machine)
const char *initrd_filename = args->initrd_filename; const char *initrd_filename = args->initrd_filename;
DeviceState *dev = NULL; DeviceState *dev = NULL;
SysBusDevice *busdev; SysBusDevice *busdev;
qemu_irq *irqp;
qemu_irq pic[128]; qemu_irq pic[128];
int n; int n;
qemu_irq cpu_irq[4]; 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 */ /* This will become a QOM property eventually */
cpu->reset_cbar = GIC_BASE_ADDR; cpu->reset_cbar = GIC_BASE_ADDR;
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];
} }
sysmem = get_system_memory(); sysmem = get_system_memory();