From patchwork Wed Jun 3 13:08:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 49469 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D544220BE7 for ; Wed, 3 Jun 2015 13:49:48 +0000 (UTC) Received: by wgla2 with SMTP id a2sf2863544wgl.1 for ; Wed, 03 Jun 2015 06:49:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references: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=al3yYiaSFbLx5vTAwSF8Rfc2xf39ZeYPB+UvQmNIbdc=; b=AHPUHZWpCDJhod+iyYWu2Eporm9D5yXnI8O/NqU5N4ugdK54lXfg5Tk+QK7MhFa0RX acF6a+tbH9j2XUmf3MJYBxaB5q9HhHR7O3EQ03XM5uBP5rhIb6fpSL1cNa9/V3ZJterr mdk+igNRSHBPDNcbIMj/1SK6Vzc8UXDrBp7Uip6q60DmYkAODBbCtevtBafGt4xfgA2+ 8/AgCyv6gHYMTOjn5Iwi/aNScH0+ykwTOKrMSErUJS3QrmOycFeE+hut+SNJ1rdxrAdj QAeD+yxAQX3Rl83Sd3N2su9pKjS45wKAFx+/Q6ek0L2TPJCPHwZ5mTbaF69i31N++gCt fisw== X-Gm-Message-State: ALoCoQk2iPRmvM/sg47OTpt1qszGtTWGlnOGuDWaLkta4uNfYPDn2W2bFtlQ9M1THnRDth9Ep0Jv X-Received: by 10.112.84.104 with SMTP id x8mr30585404lby.23.1433339387904; Wed, 03 Jun 2015 06:49:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.67 with SMTP id da3ls64747lad.49.gmail; Wed, 03 Jun 2015 06:49:47 -0700 (PDT) X-Received: by 10.152.207.105 with SMTP id lv9mr32418978lac.10.1433339387754; Wed, 03 Jun 2015 06:49:47 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id e1si18100967lam.23.2015.06.03.06.49.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jun 2015 06:49:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbcmx3 with SMTP id mx3so7373864lbc.1 for ; Wed, 03 Jun 2015 06:49:47 -0700 (PDT) X-Received: by 10.152.27.1 with SMTP id p1mr31547779lag.112.1433339387507; Wed, 03 Jun 2015 06:49:47 -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 hn6csp3882986lbb; Wed, 3 Jun 2015 06:49:46 -0700 (PDT) X-Received: by 10.140.34.81 with SMTP id k75mr13261204qgk.56.1433339385830; Wed, 03 Jun 2015 06:49:45 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id fm10si633792qcb.45.2015.06.03.06.49.45 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Jun 2015 06:49:45 -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]:35675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z093A-0001qQ-UQ for patch@linaro.org; Wed, 03 Jun 2015 09:49:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0909-00057t-Su for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:46:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0906-0000qe-If for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:46:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:52153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0906-0000pe-Ao; Wed, 03 Jun 2015 09:46:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 477B9407B4; Wed, 3 Jun 2015 16:46:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 94DABA59; Wed, 3 Jun 2015 16:08:53 +0300 (MSK) Received: (nullmailer pid 27439 invoked by uid 1000); Wed, 03 Jun 2015 13:08:52 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Wed, 3 Jun 2015 16:08:33 +0300 Message-Id: <9ff7f5bddbe5814bafe5e798d2cf1087b58dc7b6.1433336870.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev , Shannon Zhao , Shannon Zhao Subject: [Qemu-devel] [PULL 13/30] 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: mjt@tls.msk.ru 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.172 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 Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Michael Tokarev --- 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 */