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 | fcef61ec6bfaf96eeee0fb3024dd7ec8437ffa65 (patch) | |
| tree | 03404c165bd1b70e9e48b5b7e2f4119d7a117f84 /hw/arm | |
| parent | 2f69ba1736e9460aa04c46790c1d34edfbee563a (diff) | |
| download | qemu-fcef61ec6bfaf96eeee0fb3024dd7ec8437ffa65.zip qemu-fcef61ec6bfaf96eeee0fb3024dd7ec8437ffa65.tar.gz qemu-fcef61ec6bfaf96eeee0fb3024dd7ec8437ffa65.tar.bz2 | |
hw/arm/musicpal: 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-8-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/musicpal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index d715143..4404b8d 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1586,7 +1586,6 @@ static void musicpal_init(QEMUMachineInitArgs *args) const char *kernel_cmdline = args->kernel_cmdline; const char *initrd_filename = args->initrd_filename; ARMCPU *cpu; - qemu_irq *cpu_pic; qemu_irq pic[32]; DeviceState *dev; DeviceState *i2c_dev; @@ -1610,7 +1609,6 @@ static void musicpal_init(QEMUMachineInitArgs *args) fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } - cpu_pic = arm_pic_init_cpu(cpu); /* For now we use a fixed - the original - RAM size */ memory_region_init_ram(ram, NULL, "musicpal.ram", MP_RAM_DEFAULT_SIZE); @@ -1622,7 +1620,7 @@ static void musicpal_init(QEMUMachineInitArgs *args) memory_region_add_subregion(address_space_mem, MP_SRAM_BASE, sram); dev = sysbus_create_simple(TYPE_MV88W8618_PIC, MP_PIC_BASE, - cpu_pic[ARM_PIC_CPU_IRQ]); + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ)); for (i = 0; i < 32; i++) { pic[i] = qdev_get_gpio_in(dev, i); } |