[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/14] hw/arm/musicpal: Don't use arm_pic_init_cpu()
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 07/14] hw/arm/musicpal: Don't use arm_pic_init_cpu() |
Date: |
Thu, 8 Aug 2013 17:04:09 +0100 |
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 <address@hidden>
---
hw/arm/musicpal.c | 4 +---
1 file changed, 1 insertion(+), 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);
}
--
1.7.9.5
- [Qemu-devel] [PATCH 11/14] hw/arm/versatilepb: Don't use arm_pic_init_cpu(), (continued)
- [Qemu-devel] [PATCH 11/14] hw/arm/versatilepb: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 06/14] hw/arm/kzm: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 10/14] hw/arm/strongarm: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 03/14] hw/arm/exynos4210: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 05/14] hw/arm/integratorcp: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 04/14] hw/arm/highbank: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 01/14] target-arm: Make IRQ and FIQ gpio lines on the CPU object, Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 02/14] hw/arm/armv7m: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 09/14] hw/arm/realview: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 08/14] hw/arm/omap*: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- [Qemu-devel] [PATCH 07/14] hw/arm/musicpal: Don't use arm_pic_init_cpu(),
Peter Maydell <=
- [Qemu-devel] [PATCH 12/14] hw/arm/vexpress: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/08
- Re: [Qemu-devel] [PATCH 00/14] ARM: make IRQ/FIQ gpio lines on CPU object, Peter Maydell, 2013/08/20