From patchwork Fri May 29 05:27:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49136 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 644DB22B3A for ; Fri, 29 May 2015 05:34:02 +0000 (UTC) Received: by wgez8 with SMTP id z8sf15063695wge.2 for ; Thu, 28 May 2015 22:34:01 -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=bJlzp13ozqHxOF5EUBhKc0ErxGI0LLSr9EwDv83Z9GY=; b=IwGXVy6NFB5IG0/el/YzJv2T9FGU9hWh0q4A5yKeRSHS+TpzGO3q9ZoQ81jua3FHtl 8+XFQbTqv16EHNBt4ukF1zwX4nDgrPdvB5BK0dxFSLleSTnEillP0u1rYg4U1UQUdu1A vM9mFRYEdfxNeDWmdswUSNtnAwxklc0GO5GS2bN1PczbuG4wD9WEK/6GfeDcbhtdLKq+ CFSitMVdzpe7Z80Ov/3hLV8soHDp55IrOkEevrDzH2DQbiUoV7z+rtJWA87J52M/oHyY Pgilycs3otZFkClgYJVSIalYpJk99Us62JEL5Cp2xLZ9i2SG785iC1i89m/5p66gIdAZ QYqQ== X-Gm-Message-State: ALoCoQnu2RCGIB913RdxLQo3TN33rhrcQ4k1iMK6BXYwz8Kgnv2q6j9qnfpyCTlkaAQR0Y/DHyey X-Received: by 10.112.148.101 with SMTP id tr5mr5857916lbb.13.1432877641384; Thu, 28 May 2015 22:34:01 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.10 with SMTP id p10ls311488lag.29.gmail; Thu, 28 May 2015 22:34:01 -0700 (PDT) X-Received: by 10.152.6.39 with SMTP id x7mr6225345lax.18.1432877641266; Thu, 28 May 2015 22:34:01 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id wm10si3764509lbb.149.2015.05.28.22.34.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 22:34:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by labko7 with SMTP id ko7so44173781lab.2 for ; Thu, 28 May 2015 22:34:01 -0700 (PDT) X-Received: by 10.112.222.133 with SMTP id qm5mr6283729lbc.86.1432877640991; Thu, 28 May 2015 22:34:00 -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 hn6csp34815lbb; Thu, 28 May 2015 22:34:00 -0700 (PDT) X-Received: by 10.55.20.12 with SMTP id e12mr12764847qkh.56.1432877639831; Thu, 28 May 2015 22:33:59 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id kb9si4681064qcb.31.2015.05.28.22.33.59 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 22:33:59 -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]:33571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCve-0008Kw-MH for patch@linaro.org; Fri, 29 May 2015 01:33:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCqC-0006PL-DU 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-0005Dy-Vm for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:20 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:5296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCq6-0005Da-ED; 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 CMB71955; 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:57 +0800 From: Shannon Zhao To: Date: Fri, 29 May 2015 13:27:04 +0800 Message-ID: <1432877231-5136-7-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 06/13] hw/sparc/sun4m.c: Fix misusing qemu_allocate_irqs for single irq 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.54 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) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/sparc/sun4m.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index a69bf2d..8a3599c 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; @@ -1024,9 +1023,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 +1034,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,