From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxwe4-0002Eq-Qb for qemu-devel@nongnu.org; Thu, 28 May 2015 08:10:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxwe0-0003WR-CJ for qemu-devel@nongnu.org; Thu, 28 May 2015 08:10:44 -0400 From: Shannon Zhao Date: Thu, 28 May 2015 20:08:33 +0800 Message-ID: <1432814932-12608-11-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 10/29] hw/sparc/sun4m.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: ==23693== 8 bytes in 1 blocks are definitely lost in loss record 424 of 2,014 ==23693== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==23693== by 0x21B93F: malloc_and_trace (vl.c:2556) ==23693== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==23693== by 0x2700DF: qemu_extend_irqs (irq.c:55) ==23693== by 0x27016B: qemu_allocate_irqs (irq.c:64) ==23693== by 0x1EC7DE: sun4m_hw_init (sun4m.c:1027) ==23693== by 0x1ECE17: ss5_init (sun4m.c:1374) ==23693== by 0x21FD0A: main (vl.c:4249) ==23693== ==23693== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==23693== by 0x21B93F: malloc_and_trace (vl.c:2556) ==23693== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==23693== by 0x2700DF: qemu_extend_irqs (irq.c:55) ==23693== by 0x27016B: qemu_allocate_irqs (irq.c:64) ==23693== by 0x1EC074: cpu_devinit (sun4m.c:882) ==23693== by 0x1EC13A: sun4m_hw_init (sun4m.c:911) ==23693== by 0x1ECE17: ss5_init (sun4m.c:1374) ==23693== by 0x21FD0A: main (vl.c:4249) ==23693== ==23693== 1,920 bytes in 15 blocks are definitely lost in loss record 1,952 of 2,014 ==23693== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==23693== by 0x21B93F: malloc_and_trace (vl.c:2556) ==23693== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==23693== by 0x2700DF: qemu_extend_irqs (irq.c:55) ==23693== by 0x27016B: qemu_allocate_irqs (irq.c:64) ==23693== by 0x1EC179: sun4m_hw_init (sun4m.c:915) ==23693== by 0x1ECE17: ss5_init (sun4m.c:1374) ==23693== by 0x21FD0A: main (vl.c:4249) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/sparc/sun4m.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index a69bf2d..3d5707b 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -897,7 +897,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, espdma_irq, ledma_irq; qemu_irq esp_reset, dma_enable; qemu_irq fdc_tc; - qemu_irq *cpu_halt; unsigned long kernel_size; DriveInfo *fd[MAX_FD]; FWCfgState *fw_cfg; @@ -928,6 +927,10 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, hwdef->intctl_base + 0x10000ULL, cpu_irqs); + for (i = 0; i < MAX_CPUS; i++) { + g_free(cpu_irqs[i]); + } + for (i = 0; i < 32; i++) { slavio_irq[i] = qdev_get_gpio_in(slavio_intctl, i); } @@ -1024,9 +1027,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, escc_init(hwdef->serial_base, slavio_irq[15], slavio_irq[15], serial_hds[0], serial_hds[1], ESCC_CLOCK, 1); - cpu_halt = qemu_allocate_irqs(cpu_halt_signal, NULL, 1); if (hwdef->apc_base) { - apc_init(hwdef->apc_base, cpu_halt[0]); + apc_init(hwdef->apc_base, qemu_allocate_irq(cpu_halt_signal, NULL, 0)); } if (hwdef->fd_base) { @@ -1036,7 +1038,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, sun4m_fdctrl_init(slavio_irq[22], hwdef->fd_base, fd, &fdc_tc); } else { - fdc_tc = *qemu_allocate_irqs(dummy_fdc_tc, NULL, 1); + fdc_tc = qemu_allocate_irq(dummy_fdc_tc, NULL, 0); } slavio_misc_init(hwdef->slavio_base, hwdef->aux1_base, hwdef->aux2_base, -- 2.0.4