qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Shannon Zhao <zhaoshenglong@huawei.com>
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
Subject: [Qemu-devel] [PATCH v2 09/13] hw/lm32/milkymist.c: Fix misusing qemu_allocate_irqs for single irq
Date: Fri, 29 May 2015 13:27:07 +0800	[thread overview]
Message-ID: <1432877231-5136-10-git-send-email-zhaoshenglong@huawei.com> (raw)
In-Reply-To: <1432877231-5136-1-git-send-email-zhaoshenglong@huawei.com>

From: Shannon Zhao <shannon.zhao@linaro.org>

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 <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
 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

  parent reply	other threads:[~2015-05-29  5:28 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-29  5:26 [Qemu-devel] [PATCH v2 00/13] use qemu_allocate_irq not _irqs for single irq Shannon Zhao
2015-05-29  5:26 ` [Qemu-devel] [PATCH v2 01/13] hw/i386/pc: Fix misusing qemu_allocate_irqs " Shannon Zhao
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 02/13] hw/isa/lpc_ich9.c: " Shannon Zhao
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 03/13] hw/isa/i82378.c: " Shannon Zhao
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 04/13] hw/timer/arm_timer.c: " Shannon Zhao
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 05/13] hw/intc/exynos4210_gic.c: Fix memory leak by adjusting order Shannon Zhao
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 06/13] hw/sparc/sun4m.c: Fix misusing qemu_allocate_irqs for single irq Shannon Zhao
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 07/13] hw/ppc/prep.c: " Shannon Zhao
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 08/13] hw/lm32/lm32_boards.c: " Shannon Zhao
2015-05-29  5:27 ` Shannon Zhao [this message]
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 10/13] hw/unicore32/puv3.c: " Shannon Zhao
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 11/13] hw/alpha/typhoon.c: " Shannon Zhao
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 12/13] hw/arm/nseries.c: " Shannon Zhao
2015-05-29  5:27 ` [Qemu-devel] [PATCH v2 13/13] hw/display/tc6393xb.c: " Shannon Zhao
2015-05-30 14:12 ` [Qemu-devel] [PATCH v2 00/13] use qemu_allocate_irq not _irqs " Michael Tokarev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1432877231-5136-10-git-send-email-zhaoshenglong@huawei.com \
    --to=zhaoshenglong@huawei.com \
    --cc=mjt@tls.msk.ru \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=shannon.zhao@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).