Revision fe9120a5
b/hw/arm/vexpress.c | ||
---|---|---|
183 | 183 |
MemoryRegion *lowram = g_new(MemoryRegion, 1); |
184 | 184 |
DeviceState *dev; |
185 | 185 |
SysBusDevice *busdev; |
186 |
qemu_irq *irqp; |
|
187 | 186 |
int n; |
188 | 187 |
qemu_irq cpu_irq[4]; |
189 | 188 |
ram_addr_t low_ram_size; |
... | ... | |
198 | 197 |
fprintf(stderr, "Unable to find CPU definition\n"); |
199 | 198 |
exit(1); |
200 | 199 |
} |
201 |
irqp = arm_pic_init_cpu(cpu); |
|
202 |
cpu_irq[n] = irqp[ARM_PIC_CPU_IRQ]; |
|
200 |
cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ); |
|
203 | 201 |
} |
204 | 202 |
|
205 | 203 |
if (ram_size > 0x40000000) { |
... | ... | |
312 | 310 |
|
313 | 311 |
for (n = 0; n < smp_cpus; n++) { |
314 | 312 |
ARMCPU *cpu; |
315 |
qemu_irq *irqp; |
|
316 | 313 |
|
317 | 314 |
cpu = cpu_arm_init(cpu_model); |
318 | 315 |
if (!cpu) { |
319 | 316 |
fprintf(stderr, "Unable to find CPU definition\n"); |
320 | 317 |
exit(1); |
321 | 318 |
} |
322 |
irqp = arm_pic_init_cpu(cpu); |
|
323 |
cpu_irq[n] = irqp[ARM_PIC_CPU_IRQ]; |
|
319 |
cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ); |
|
324 | 320 |
} |
325 | 321 |
|
326 | 322 |
{ |
Also available in: Unified diff