From patchwork Fri May 29 05:27:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49134 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0C13922B3A for ; Fri, 29 May 2015 05:32:37 +0000 (UTC) Received: by wifq9 with SMTP id q9sf2389253wif.3 for ; Thu, 28 May 2015 22:32:36 -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=Xt+Lg4tcY3PmOLFZJTxk7N7ipYcTWX9G7ZSgu3IOFZ4=; b=a9LOXiqsC0L8qotdHf387TF+fA0NfhaVczuUVyo92hR5vtbANoef3e/rISEzeSDNbE j3q4k4iuuqJPfTrgYtMll7v9+z4Jxq2zb4qz7D6e6rj2gWTIPEdOFvSsL+FHOinv03iz Q+0vO+O3I9ecWivUyrW6CltAKCIGSYMtxxtZsaaRPOCCLn1pwRdm6IwOL6Chl7OJBxTj ddljZFEOWiuHZ+vISJ/dSn/622mPNaXTkc3KtbniyH7r2k6Q6oW/eO4yj7NreCkxW1Os IIr8v+uVagtQnsMzQCjy3Ruo+8n21CPro1juJ2JI05a4GN3q/Ca/seG7U0PpOYaTwZ4I kGXA== X-Gm-Message-State: ALoCoQk4QbqboUbC5pBH7eYa//Pr8OkIZEH0Na6v1bD7p03Oj2x8x0MSuoEHFze1cuZN/9uEgh2S X-Received: by 10.194.175.36 with SMTP id bx4mr5739765wjc.1.1432877556368; Thu, 28 May 2015 22:32:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.65 with SMTP id r1ls50167lag.61.gmail; Thu, 28 May 2015 22:32:36 -0700 (PDT) X-Received: by 10.112.42.16 with SMTP id j16mr6095251lbl.98.1432877556173; Thu, 28 May 2015 22:32:36 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id xh7si3765844lac.132.2015.05.28.22.32.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 22:32:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbbqq2 with SMTP id qq2so41695309lbb.3 for ; Thu, 28 May 2015 22:32:36 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr6110108lac.41.1432877555951; Thu, 28 May 2015 22:32:35 -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 hn6csp34236lbb; Thu, 28 May 2015 22:32:35 -0700 (PDT) X-Received: by 10.55.56.8 with SMTP id f8mr12526295qka.97.1432877554767; Thu, 28 May 2015 22:32:34 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w7si4700353qck.9.2015.05.28.22.32.34 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 22:32:34 -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]:33555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCuH-0005li-UQ for patch@linaro.org; Fri, 29 May 2015 01:32:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCqB-0006NJ-E4 for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyCq9-0005F2-Vb for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:19 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:21700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCq9-0005EB-Aw; Fri, 29 May 2015 01:28:17 -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 BGS73954; Fri, 29 May 2015 13:28:10 +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:28:01 +0800 From: Shannon Zhao To: Date: Fri, 29 May 2015 13:27:07 +0800 Message-ID: <1432877231-5136-10-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.001C, 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: 3687fa4b0570a0e269cbe45deaca6957 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 09/13] hw/lm32/milkymist.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.217.182 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: ==20652== 8 bytes in 1 blocks are definitely lost in loss record 252 of 1,314 ==20652== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==20652== by 0x1E77E7: malloc_and_trace (vl.c:2556) ==20652== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==20652== by 0x238C43: qemu_extend_irqs (irq.c:55) ==20652== by 0x238CCF: qemu_allocate_irqs (irq.c:64) ==20652== by 0x1C49AD: milkymist_init (milkymist.c:133) ==20652== by 0x1EBBB2: main (vl.c:4249) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/lm32/milkymist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index e0cec7d..e755f5b 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -86,7 +86,7 @@ milkymist_init(MachineState *machine) DriveInfo *dinfo; MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *phys_sdram = g_new(MemoryRegion, 1); - qemu_irq irq[32], *cpu_irq; + qemu_irq irq[32]; int i; char *bios_filename; ResetInfo *reset_info; @@ -130,8 +130,7 @@ milkymist_init(MachineState *machine) 2, 0x00, 0x89, 0x00, 0x1d, 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); }