From patchwork Thu May 28 12:08:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49068 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 5E2DF218EC for ; Thu, 28 May 2015 12:14:07 +0000 (UTC) Received: by wgez8 with SMTP id z8sf9676691wge.2 for ; Thu, 28 May 2015 05:14:06 -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=89rbqqH9wf7oG/N+t7RgjlQdGaUxsWuV8B+6rDWYels=; b=AOxXiyLIwMejxX5gGKDStWvYgFQwhlK2/R/qGspoltVyzd6Kvu1EaLO+MscAQLstKN vLSAHkm3TH+PlYArnoV28FIP2NQcFOcoW4WZ5g4fVVlw24o/ZRM3HXCRqdXoNAyJt3K3 DlDLiy8PknSCzI+TnsZfX6hkZifqYZlSywsNWjZ2p+k6HOEvTolfyl/IJiUOs6xjP9Bi J4EC7OunvTjdTSIJsXGR2IM88yN11dz5VG+1pFQNqefXaoImHfQ9wjav0L+Y2QyOQ4Xz HqturMLMg2Z6q2CWGtav0I3eGfi5zAFJfRMReGWLsA5ytop5gAHFO6Hm8U9+3f98GEPN j2gg== X-Gm-Message-State: ALoCoQnS2WLGvIbkXZpx3uDd8bnA7UTzdJ8+lZ1JCtXK3Ow8U/cb4ZXPqkjxQrtrDi02GuMAut+w X-Received: by 10.180.90.106 with SMTP id bv10mr7571861wib.6.1432815246704; Thu, 28 May 2015 05:14:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.245.43 with SMTP id xl11ls181621lac.21.gmail; Thu, 28 May 2015 05:14:06 -0700 (PDT) X-Received: by 10.152.42.230 with SMTP id r6mr2448421lal.30.1432815246560; Thu, 28 May 2015 05:14:06 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id bf11si1814117lab.37.2015.05.28.05.14.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 05:14:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lagv1 with SMTP id v1so30027579lag.3 for ; Thu, 28 May 2015 05:14:06 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr2438786lay.72.1432815246473; Thu, 28 May 2015 05:14:06 -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 hn6csp1107691lbb; Thu, 28 May 2015 05:14:05 -0700 (PDT) X-Received: by 10.55.33.147 with SMTP id f19mr4420827qki.92.1432815245273; Thu, 28 May 2015 05:14:05 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u82si2185517qhd.11.2015.05.28.05.14.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 05:14:05 -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]:58324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxwhI-0007Ip-9a for patch@linaro.org; Thu, 28 May 2015 08:14:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxwe4-0002Eq-Qb for qemu-devel@nongnu.org; Thu, 28 May 2015 08:10:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxwe0-0003WR-CJ for qemu-devel@nongnu.org; Thu, 28 May 2015 08:10:44 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:45243) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxwdz-0003V6-Km; Thu, 28 May 2015 08:10:40 -0400 Received: from 172.24.2.119 (EHLO SZXEML429-HUB.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id COP98099; Thu, 28 May 2015 20:10:30 +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; Thu, 28 May 2015 20:10:02 +0800 From: Shannon Zhao To: Date: Thu, 28 May 2015 20:08:33 +0800 Message-ID: <1432814932-12608-11-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1432814932-12608-1-git-send-email-zhaoshenglong@huawei.com> References: <1432814932-12608-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: 58.251.152.64 Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, mjt@tls.msk.ru, shannon.zhao@linaro.org, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 10/29] hw/sparc/sun4m.c: Fix memory leak spotted by valgrind 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.215.51 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: ==23693== 8 bytes in 1 blocks are definitely lost in loss record 424 of 2,014 ==23693== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==23693== by 0x21B93F: malloc_and_trace (vl.c:2556) ==23693== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==23693== by 0x2700DF: qemu_extend_irqs (irq.c:55) ==23693== by 0x27016B: qemu_allocate_irqs (irq.c:64) ==23693== by 0x1EC7DE: sun4m_hw_init (sun4m.c:1027) ==23693== by 0x1ECE17: ss5_init (sun4m.c:1374) ==23693== by 0x21FD0A: main (vl.c:4249) ==23693== ==23693== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==23693== by 0x21B93F: malloc_and_trace (vl.c:2556) ==23693== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==23693== by 0x2700DF: qemu_extend_irqs (irq.c:55) ==23693== by 0x27016B: qemu_allocate_irqs (irq.c:64) ==23693== by 0x1EC074: cpu_devinit (sun4m.c:882) ==23693== by 0x1EC13A: sun4m_hw_init (sun4m.c:911) ==23693== by 0x1ECE17: ss5_init (sun4m.c:1374) ==23693== by 0x21FD0A: main (vl.c:4249) ==23693== ==23693== 1,920 bytes in 15 blocks are definitely lost in loss record 1,952 of 2,014 ==23693== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==23693== by 0x21B93F: malloc_and_trace (vl.c:2556) ==23693== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==23693== by 0x2700DF: qemu_extend_irqs (irq.c:55) ==23693== by 0x27016B: qemu_allocate_irqs (irq.c:64) ==23693== by 0x1EC179: sun4m_hw_init (sun4m.c:915) ==23693== by 0x1ECE17: ss5_init (sun4m.c:1374) ==23693== by 0x21FD0A: main (vl.c:4249) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/sparc/sun4m.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index a69bf2d..3d5707b 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -897,7 +897,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, espdma_irq, ledma_irq; qemu_irq esp_reset, dma_enable; qemu_irq fdc_tc; - qemu_irq *cpu_halt; unsigned long kernel_size; DriveInfo *fd[MAX_FD]; FWCfgState *fw_cfg; @@ -928,6 +927,10 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, hwdef->intctl_base + 0x10000ULL, cpu_irqs); + for (i = 0; i < MAX_CPUS; i++) { + g_free(cpu_irqs[i]); + } + for (i = 0; i < 32; i++) { slavio_irq[i] = qdev_get_gpio_in(slavio_intctl, i); } @@ -1024,9 +1027,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, escc_init(hwdef->serial_base, slavio_irq[15], slavio_irq[15], serial_hds[0], serial_hds[1], ESCC_CLOCK, 1); - cpu_halt = qemu_allocate_irqs(cpu_halt_signal, NULL, 1); if (hwdef->apc_base) { - apc_init(hwdef->apc_base, cpu_halt[0]); + apc_init(hwdef->apc_base, qemu_allocate_irq(cpu_halt_signal, NULL, 0)); } if (hwdef->fd_base) { @@ -1036,7 +1038,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, sun4m_fdctrl_init(slavio_irq[22], hwdef->fd_base, fd, &fdc_tc); } else { - fdc_tc = *qemu_allocate_irqs(dummy_fdc_tc, NULL, 1); + fdc_tc = qemu_allocate_irq(dummy_fdc_tc, NULL, 0); } slavio_misc_init(hwdef->slavio_base, hwdef->aux1_base, hwdef->aux2_base,