[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/10] hw/arm/spitz.c: Fix misusing qemu_allocate_ir
From: |
Shannon Zhao |
Subject: |
[Qemu-devel] [PATCH 07/10] hw/arm/spitz.c: Fix misusing qemu_allocate_irqs |
Date: |
Thu, 2 Jul 2015 17:49:20 +0800 |
From: Shannon Zhao <address@hidden>
Use qemu_allocate_irq instead of qemu_allocate_irqs to fix memory leak.
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
---
hw/arm/spitz.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 5bf032a..d51180a 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -815,19 +815,24 @@ static void spitz_out_switch(void *opaque, int line, int
level)
static void spitz_scoop_gpio_setup(PXA2xxState *cpu,
DeviceState *scp0, DeviceState *scp1)
{
- qemu_irq *outsignals = qemu_allocate_irqs(spitz_out_switch, cpu, 8);
-
- qdev_connect_gpio_out(scp0, SPITZ_SCP_CHRG_ON, outsignals[0]);
- qdev_connect_gpio_out(scp0, SPITZ_SCP_JK_B, outsignals[1]);
- qdev_connect_gpio_out(scp0, SPITZ_SCP_LED_GREEN, outsignals[2]);
- qdev_connect_gpio_out(scp0, SPITZ_SCP_LED_ORANGE, outsignals[3]);
+ qdev_connect_gpio_out(scp0, SPITZ_SCP_CHRG_ON,
+ qemu_allocate_irq(spitz_out_switch, cpu, 0));
+ qdev_connect_gpio_out(scp0, SPITZ_SCP_JK_B,
+ qemu_allocate_irq(spitz_out_switch, cpu, 1));
+ qdev_connect_gpio_out(scp0, SPITZ_SCP_LED_GREEN,
+ qemu_allocate_irq(spitz_out_switch, cpu, 2));
+ qdev_connect_gpio_out(scp0, SPITZ_SCP_LED_ORANGE,
+ qemu_allocate_irq(spitz_out_switch, cpu, 3));
if (scp1) {
- qdev_connect_gpio_out(scp1, SPITZ_SCP2_BACKLIGHT_CONT, outsignals[4]);
- qdev_connect_gpio_out(scp1, SPITZ_SCP2_BACKLIGHT_ON, outsignals[5]);
+ qdev_connect_gpio_out(scp1, SPITZ_SCP2_BACKLIGHT_CONT,
+ qemu_allocate_irq(spitz_out_switch, cpu, 4));
+ qdev_connect_gpio_out(scp1, SPITZ_SCP2_BACKLIGHT_ON,
+ qemu_allocate_irq(spitz_out_switch, cpu, 5));
}
- qdev_connect_gpio_out(scp0, SPITZ_SCP_ADC_TEMP_ON, outsignals[6]);
+ qdev_connect_gpio_out(scp0, SPITZ_SCP_ADC_TEMP_ON,
+ qemu_allocate_irq(spitz_out_switch, cpu, 6));
}
#define SPITZ_GPIO_HSYNC 22
--
2.0.4
- [Qemu-devel] [PATCH 00/10] fix memory leak, Shannon Zhao, 2015/07/02
- [Qemu-devel] [PATCH 06/10] hw/arm/palm.c: Fix misusing qemu_allocate_irqs, Shannon Zhao, 2015/07/02
- [Qemu-devel] [PATCH 07/10] hw/arm/spitz.c: Fix misusing qemu_allocate_irqs,
Shannon Zhao <=
- [Qemu-devel] [PATCH 08/10] hw/arm/tosa.c: Fix misusing qemu_allocate_irqs, Shannon Zhao, 2015/07/02
- [Qemu-devel] [PATCH 10/10] hw/openrisc/pic_cpu.c: use qemu_allocate_irq to fix memory leak, Shannon Zhao, 2015/07/02
- [Qemu-devel] [PATCH 09/10] hw/mips/mips_int.c: use qemu_allocate_irq to fix memory leak, Shannon Zhao, 2015/07/02
- [Qemu-devel] [PATCH 04/10] hw/m68k/mcf_intc.c: convert mcf_intc to QOM, Shannon Zhao, 2015/07/02
- [Qemu-devel] [PATCH 01/10] hw/ppc/ppc4xx_devs.c: Convert ppcuic to QOM, Shannon Zhao, 2015/07/02
- [Qemu-devel] [PATCH 05/10] hw/sh4/r2d.c: convert r2d_fpga to QOM, Shannon Zhao, 2015/07/02
- [Qemu-devel] [PATCH 03/10] hw/m68k/mcf5206.c: convert m5206_mbar to QOM, Shannon Zhao, 2015/07/02
- [Qemu-devel] [PATCH 02/10] include/hw/sparc/grlib.h: Store irqs in DeviceState, Shannon Zhao, 2015/07/02