From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCqB-0006NJ-E4 for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyCq9-0005F2-Vb for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:19 -0400 From: Shannon Zhao Date: Fri, 29 May 2015 13:27:07 +0800 Message-ID: <1432877231-5136-10-git-send-email-zhaoshenglong@huawei.com> In-Reply-To: <1432877231-5136-1-git-send-email-zhaoshenglong@huawei.com> References: <1432877231-5136-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2 09/13] hw/lm32/milkymist.c: Fix misusing qemu_allocate_irqs for single irq 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: ==20652== 8 bytes in 1 blocks are definitely lost in loss record 252 of 1,314 ==20652== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==20652== by 0x1E77E7: malloc_and_trace (vl.c:2556) ==20652== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==20652== by 0x238C43: qemu_extend_irqs (irq.c:55) ==20652== by 0x238CCF: qemu_allocate_irqs (irq.c:64) ==20652== by 0x1C49AD: milkymist_init (milkymist.c:133) ==20652== by 0x1EBBB2: main (vl.c:4249) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/lm32/milkymist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index e0cec7d..e755f5b 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -86,7 +86,7 @@ milkymist_init(MachineState *machine) DriveInfo *dinfo; MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *phys_sdram = g_new(MemoryRegion, 1); - qemu_irq irq[32], *cpu_irq; + qemu_irq irq[32]; int i; char *bios_filename; ResetInfo *reset_info; @@ -130,8 +130,7 @@ milkymist_init(MachineState *machine) 2, 0x00, 0x89, 0x00, 0x1d, 1); /* create irq lines */ - cpu_irq = qemu_allocate_irqs(cpu_irq_handler, cpu, 1); - env->pic_state = lm32_pic_init(*cpu_irq); + env->pic_state = lm32_pic_init(qemu_allocate_irq(cpu_irq_handler, cpu, 0)); for (i = 0; i < 32; i++) { irq[i] = qdev_get_gpio_in(env->pic_state, i); } -- 2.0.4