From patchwork Fri May 29 05:27:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49129 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 834C422B3A for ; Fri, 29 May 2015 05:29:30 +0000 (UTC) Received: by wixv7 with SMTP id v7sf2392497wix.0 for ; Thu, 28 May 2015 22:29:29 -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=31CdTNoW2nYYZTB5nyeWotjlUQIWfJlzojGodrgBOs8=; b=OgmKtExG8mq/aqEkYk3AhXtHEFMQ61BV8k/Xrod/O1m4ngtOXBwECMliMJPWflVv+3 y0EsgLPQft9R/6JUokn8qv/jsGzbE9cROYn6+MB7Y/h0dxMZRZ6FxT6MPgPerAysuJV3 ulmT0P8/faKqmdebLHuhnE6Fe4oFar7DNkk2gsrGrPOo2s1JKJyAPiiwYHMJW6g/uQEG LIky7du43BbgMWfMFMq1/Po+IxZRZ4SWbW0TDFkrH9KtnFXLX2yL5Civo+ksaQgaeHZW sHL5DbT1Cr2QrMrTJ3YOrVX9zzNuoOh8zBxFPkHsDLFCMYmIdpXCbrB4tjRZIJjC7rg0 TB8Q== X-Gm-Message-State: ALoCoQnxDRWggr/FRTGIMX+4aIkjhZNeYKl+wWPMFnoBR0arAXmo6pB+2azEPMf2VbDdDzSJCTnJ X-Received: by 10.112.166.137 with SMTP id zg9mr5813579lbb.11.1432877369494; Thu, 28 May 2015 22:29:29 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.135 with SMTP id r7ls270282laa.36.gmail; Thu, 28 May 2015 22:29:29 -0700 (PDT) X-Received: by 10.112.168.102 with SMTP id zv6mr6231573lbb.45.1432877369312; Thu, 28 May 2015 22:29:29 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id xx2si3775313lbb.82.2015.05.28.22.29.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 22:29:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lagv1 with SMTP id v1so47686488lag.3 for ; Thu, 28 May 2015 22:29:29 -0700 (PDT) X-Received: by 10.112.204.6 with SMTP id ku6mr6216469lbc.73.1432877369214; Thu, 28 May 2015 22:29:29 -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 hn6csp32748lbb; Thu, 28 May 2015 22:29:28 -0700 (PDT) X-Received: by 10.229.183.5 with SMTP id ce5mr7957095qcb.28.1432877367992; Thu, 28 May 2015 22:29:27 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 203si4625220qhw.125.2015.05.28.22.29.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 22:29:27 -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]:33521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCrH-0007zO-23 for patch@linaro.org; Fri, 29 May 2015 01:29:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCqC-0006Oz-53 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 1YyCqA-0005Fk-RV for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:20 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:21702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCqA-0005EX-67; Fri, 29 May 2015 01:28:18 -0400 Received: from 172.24.2.119 (EHLO SZXEML429-HUB.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BGS73957; Fri, 29 May 2015 13:28:11 +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:59 +0800 From: Shannon Zhao To: Date: Fri, 29 May 2015 13:27:06 +0800 Message-ID: <1432877231-5136-9-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-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.5567F8EB.0149, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: c8b9bf6addbbe3eb785b93e9bc45d847 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 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 08/13] hw/lm32/lm32_boards.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.46 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: ==8662== 8 bytes in 1 blocks are definitely lost in loss record 228 of 1,108 ==8662== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==8662== by 0x1E77EB: malloc_and_trace (vl.c:2556) ==8662== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==8662== by 0x238C47: qemu_extend_irqs (irq.c:55) ==8662== by 0x238CD3: qemu_allocate_irqs (irq.c:64) ==8662== by 0x1C32FC: lm32_evr_init (lm32_boards.c:126) ==8662== by 0x1EBBB6: main (vl.c:4249) ==12877== 8 bytes in 1 blocks are definitely lost in loss record 209 of 1,042 ==12877== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==12877== by 0x1E77E7: malloc_and_trace (vl.c:2556) ==12877== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==12877== by 0x238C43: qemu_extend_irqs (irq.c:55) ==12877== by 0x238CCF: qemu_allocate_irqs (irq.c:64) ==12877== by 0x1C384E: lm32_uclinux_init (lm32_boards.c:228) ==12877== by 0x1EBBB2: main (vl.c:4249) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/lm32/lm32_boards.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 14d0efc..70f48d3 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -78,7 +78,7 @@ static void lm32_evr_init(MachineState *machine) DriveInfo *dinfo; MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *phys_ram = g_new(MemoryRegion, 1); - qemu_irq *cpu_irq, irq[32]; + qemu_irq irq[32]; ResetInfo *reset_info; int i; @@ -123,8 +123,7 @@ static void lm32_evr_init(MachineState *machine) 1, 2, 0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1); /* create irq lines */ - cpu_irq = qemu_allocate_irqs(cpu_irq_handler, cpu, 1); - env->pic_state = lm32_pic_init(*cpu_irq); + env->pic_state = lm32_pic_init(qemu_allocate_irq(cpu_irq_handler, cpu, 0)); for (i = 0; i < 32; i++) { irq[i] = qdev_get_gpio_in(env->pic_state, i); } @@ -173,7 +172,7 @@ static void lm32_uclinux_init(MachineState *machine) DriveInfo *dinfo; MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *phys_ram = g_new(MemoryRegion, 1); - qemu_irq *cpu_irq, irq[32]; + qemu_irq irq[32]; HWSetup *hw; ResetInfo *reset_info; int i; @@ -225,8 +224,7 @@ static void lm32_uclinux_init(MachineState *machine) 1, 2, 0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1); /* create irq lines */ - cpu_irq = qemu_allocate_irqs(cpu_irq_handler, env, 1); - env->pic_state = lm32_pic_init(*cpu_irq); + env->pic_state = lm32_pic_init(qemu_allocate_irq(cpu_irq_handler, env, 0)); for (i = 0; i < 32; i++) { irq[i] = qdev_get_gpio_in(env->pic_state, i); }