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 02/13] hw/isa/lpc_ich9.c: Fix misusing qemu_allocate_irqs for single irq
Date: Fri, 29 May 2015 13:27:00 +0800	[thread overview]
Message-ID: <1432877231-5136-3-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:
==25058== 8 bytes in 1 blocks are definitely lost in loss record 623 of 3,473
==25058==    at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==25058==    by 0x2EB657: malloc_and_trace (vl.c:2556)
==25058==    by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3)
==25058==    by 0x377C27: qemu_extend_irqs (irq.c:55)
==25058==    by 0x377CB3: qemu_allocate_irqs (irq.c:64)
==25058==    by 0x222338: ich9_lpc_pm_init (lpc_ich9.c:365)
==25058==    by 0x255C42: pc_q35_init (pc_q35.c:255)
==25058==    by 0x2EFA22: main (vl.c:4249)

Since ich9_lpc_pm_init only requests one irq, so let it just call
qemu_allocate_irq.

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
 hw/isa/lpc_ich9.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index dba7585..144b210 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -360,11 +360,8 @@ static void ich9_set_sci(void *opaque, int irq_num, int level)
 void ich9_lpc_pm_init(PCIDevice *lpc_pci)
 {
     ICH9LPCState *lpc = ICH9_LPC_DEVICE(lpc_pci);
-    qemu_irq *sci_irq;
-
-    sci_irq = qemu_allocate_irqs(ich9_set_sci, lpc, 1);
-    ich9_pm_init(lpc_pci, &lpc->pm, sci_irq[0]);
 
+    ich9_pm_init(lpc_pci, &lpc->pm, qemu_allocate_irq(ich9_set_sci, lpc, 0));
     ich9_lpc_reset(&lpc->d.qdev);
 }
 
-- 
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 ` Shannon Zhao [this message]
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 ` [Qemu-devel] [PATCH v2 09/13] hw/lm32/milkymist.c: " Shannon Zhao
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-3-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).