From patchwork Fri May 29 05:27:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49132 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 53D0022B3A for ; Fri, 29 May 2015 05:31:23 +0000 (UTC) Received: by lbcak1 with SMTP id ak1sf15680974lbc.2 for ; Thu, 28 May 2015 22:31:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:content-type:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=LIrffsZ0+zdEkRRaVAugVr/oIx8ZJqbMQ/HHwNXAxT4=; b=DJujM02kQc2i96lIgj8s/5AVaSG09LRn259y1p2hap24VdJK8PYWPQT2mp9ynobtpx Rj/te8Xn/JcAhu3fg2gz1SEEiLjwJsINKieDvr8L4s34+jYK7B9eZ9LrJjuzf432JNr5 HhHaRhM4AeGn3pHaE1zRcwiVP7++ksGhTglyvuCTaJ0x2IAQh1OmfT7Nyrdgt3G8I8VJ vvtvC8ihwdVKNVO5Xt035juaNDm8i50DpFy6rkgNMwq0lcEteFxnP7RNfxtZ+FddjlET 9JecYrUvt7aLVFoyvFKBGdO2Mk0DG2J9CSNaDVq9xvq1SOi6eF9Uky1/zCA9zcsD1vpE pYjA== X-Gm-Message-State: ALoCoQnzujl8RhECi/4XzamOqPRycH782bHyc97IdvATvEmsaV4oApP+ffcOd/BMFL9/kTPqu+s/ X-Received: by 10.112.97.210 with SMTP id ec18mr5801687lbb.15.1432877481776; Thu, 28 May 2015 22:31:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.227 with SMTP id t3ls298255laj.72.gmail; Thu, 28 May 2015 22:31:21 -0700 (PDT) X-Received: by 10.152.22.72 with SMTP id b8mr6225505laf.1.1432877481661; Thu, 28 May 2015 22:31:21 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id de11si3780399lac.76.2015.05.28.22.31.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 22:31:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbbqq2 with SMTP id qq2so41682973lbb.3 for ; Thu, 28 May 2015 22:31:21 -0700 (PDT) X-Received: by 10.152.27.1 with SMTP id p1mr6120366lag.112.1432877481571; Thu, 28 May 2015 22:31:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp33665lbb; Thu, 28 May 2015 22:31:20 -0700 (PDT) X-Received: by 10.55.33.30 with SMTP id h30mr12397625qkh.87.1432877480270; Thu, 28 May 2015 22:31:20 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j202si4679800qhc.29.2015.05.28.22.31.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 22:31:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:33541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCt5-0003Jh-Fd for patch@linaro.org; Fri, 29 May 2015 01:31:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCqC-0006P9-BO for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyCq6-0005E3-Vx for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:20 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:5295) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCq6-0005DE-EW; Fri, 29 May 2015 01:28:14 -0400 Received: from 172.24.2.119 (EHLO SZXEML429-HUB.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CMB71954; Fri, 29 May 2015 13:28:06 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by SZXEML429-HUB.china.huawei.com (10.82.67.184) with Microsoft SMTP Server id 14.3.158.1; Fri, 29 May 2015 13:27:56 +0800 From: Shannon Zhao To: Date: Fri, 29 May 2015 13:27:03 +0800 Message-ID: <1432877231-5136-6-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 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 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 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 05/13] hw/intc/exynos4210_gic.c: Fix memory leak by adjusting order X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao valgrind complains about: ==17211== 784 (288 direct, 496 indirect) bytes in 4 blocks are definitely lost in loss record 3,018 of 3,201 ==17211== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==17211== by 0x35478F: malloc_and_trace (vl.c:2556) ==17211== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==17211== by 0x5148DD: object_new_with_type (object.c:428) ==17211== by 0x514939: object_new (object.c:439) ==17211== by 0x3EDA38: qemu_allocate_irq (irq.c:71) ==17211== by 0x3EDC2D: qemu_irq_split (irq.c:119) ==17211== by 0x23D231: exynos4210_init_board_irqs (exynos4210_gic.c:216) ==17211== by 0x293B00: exynos4210_init (exynos4210.c:250) ==17211== by 0x27915A: exynos4_boards_init_common (exynos4_boards.c:127) ==17211== by 0x2791D9: smdkc210_init (exynos4_boards.c:140) ==17211== by 0x358B5A: main (vl.c:4249) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/intc/exynos4210_gic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index 0590d5d..b2a4950 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -213,9 +213,6 @@ void exynos4210_init_board_irqs(Exynos4210Irq *s) uint32_t grp, bit, irq_id, n; for (n = 0; n < EXYNOS4210_MAX_EXT_COMBINER_IN_IRQ; n++) { - s->board_irqs[n] = qemu_irq_split(s->int_combiner_irq[n], - s->ext_combiner_irq[n]); - irq_id = 0; if (n == EXYNOS4210_COMBINER_GET_IRQ_NUM(1, 4) || n == EXYNOS4210_COMBINER_GET_IRQ_NUM(12, 4)) { @@ -230,8 +227,10 @@ void exynos4210_init_board_irqs(Exynos4210Irq *s) if (irq_id) { s->board_irqs[n] = qemu_irq_split(s->int_combiner_irq[n], s->ext_gic_irq[irq_id-32]); + } else { + s->board_irqs[n] = qemu_irq_split(s->int_combiner_irq[n], + s->ext_combiner_irq[n]); } - } for (; n < EXYNOS4210_MAX_INT_COMBINER_IN_IRQ; n++) { /* these IDs are passed to Internal Combiner and External GIC */