From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxwfQ-0004Sh-LP for qemu-devel@nongnu.org; Thu, 28 May 2015 08:12:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxwfM-0004M4-Tf for qemu-devel@nongnu.org; Thu, 28 May 2015 08:12:08 -0400 From: Shannon Zhao Date: Thu, 28 May 2015 20:08:49 +0800 Message-ID: <1432814932-12608-27-git-send-email-zhaoshenglong@huawei.com> In-Reply-To: <1432814932-12608-1-git-send-email-zhaoshenglong@huawei.com> References: <1432814932-12608-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 26/29] hw/arm/spitz.c: Fix memory leak spotted by valgrind List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, mjt@tls.msk.ru, shannon.zhao@linaro.org, peter.maydell@linaro.org From: Shannon Zhao valgrind complains about: ==19832== 244 (64 direct, 180 indirect) bytes in 1 blocks are definitely lost in loss record 2,220 of 2,846 ==19832== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==19832== by 0x35479F: malloc_and_trace (vl.c:2556) ==19832== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==19832== by 0x3ED99B: qemu_extend_irqs (irq.c:55) ==19832== by 0x3EDA27: qemu_allocate_irqs (irq.c:64) ==19832== by 0x2875CF: spitz_scoop_gpio_setup (spitz.c:818) ==19832== by 0x2879FE: spitz_common_init (spitz.c:931) ==19832== by 0x287AEF: spitz_init (spitz.c:957) ==19832== by 0x358B6A: main (vl.c:4249) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/arm/spitz.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 5bf032a..6ff1825 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -815,7 +815,7 @@ 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); + qemu_irq *outsignals = qemu_allocate_irqs(spitz_out_switch, cpu, 7); qdev_connect_gpio_out(scp0, SPITZ_SCP_CHRG_ON, outsignals[0]); qdev_connect_gpio_out(scp0, SPITZ_SCP_JK_B, outsignals[1]); @@ -825,9 +825,13 @@ static void spitz_scoop_gpio_setup(PXA2xxState *cpu, if (scp1) { qdev_connect_gpio_out(scp1, SPITZ_SCP2_BACKLIGHT_CONT, outsignals[4]); qdev_connect_gpio_out(scp1, SPITZ_SCP2_BACKLIGHT_ON, outsignals[5]); + } else { + qemu_free_irq(outsignals[4]); + qemu_free_irq(outsignals[5]); } qdev_connect_gpio_out(scp0, SPITZ_SCP_ADC_TEMP_ON, outsignals[6]); + g_free(outsignals); } #define SPITZ_GPIO_HSYNC 22 -- 2.0.4