From patchwork Fri May 29 05:27:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49127 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 0FC2A22B3A for ; Fri, 29 May 2015 05:29:22 +0000 (UTC) Received: by wibbk2 with SMTP id bk2sf2315230wib.2 for ; Thu, 28 May 2015 22:29:21 -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=DHaRE7hkkqkgemTzfr2hFzgdVXP+dODsXKe8R00A/iw=; b=m7fmRsRfNUYUpRsMvs3l4T0gptLXgKS/JM96y1FG+1YeRtqyiyeEZvEeT7ZV+bP6/V jI/jzBQ92M5Wcd4OcrOUzeg1yXLTt6wvjLZfz0ME9J6cA1PqvHRNKKZBV6ADJxEsVZfu xQM1uD0sPiSQb7BEu1qu+zZCokNV97nBIBLnr/6xAICihVfmqgRXwpD1vYTJo4piZLDX f3+ZR+6L9Ky6RQljItzhtvafNtOfpeV+oaH+xEkr592Zz/ZHGoxnpBLnn5u6MED+G27d 18+DCVG7c40pSqzrybTUXuHzYSHlWI1FQqtN+Ez9N6c0dgPsL5k1Iw7xddLDUADnqPrG hYSQ== X-Gm-Message-State: ALoCoQlYxdX+fwAppUsCXtpL4bzs2w+vtaLrGhClGfpnxgujQrnNt8GiQ1oysqesVl6iJfgsrYN2 X-Received: by 10.194.202.229 with SMTP id kl5mr5715004wjc.3.1432877361112; Thu, 28 May 2015 22:29:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.22.99 with SMTP id c3ls272331laf.96.gmail; Thu, 28 May 2015 22:29:20 -0700 (PDT) X-Received: by 10.112.136.166 with SMTP id qb6mr6331714lbb.54.1432877360855; Thu, 28 May 2015 22:29:20 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id e9si3782287lag.58.2015.05.28.22.29.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 22:29:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by labpy14 with SMTP id py14so35995227lab.0 for ; Thu, 28 May 2015 22:29:20 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr6105870lbc.41.1432877360389; Thu, 28 May 2015 22:29:20 -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 hn6csp32680lbb; Thu, 28 May 2015 22:29:19 -0700 (PDT) X-Received: by 10.55.22.74 with SMTP id g71mr12318685qkh.28.1432877359160; Thu, 28 May 2015 22:29:19 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 131si4668131qhw.45.2015.05.28.22.29.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 22:29:19 -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]:33519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCr8-0007ZB-AF for patch@linaro.org; Fri, 29 May 2015 01:29:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCq8-0006Ll-IZ for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyCq4-0005D6-6A for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:16 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:21638) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCq3-0005CQ-J1; Fri, 29 May 2015 01:28:12 -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 BGS73940; Fri, 29 May 2015 13:28:01 +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:52 +0800 From: Shannon Zhao To: Date: Fri, 29 May 2015 13:27:00 +0800 Message-ID: <1432877231-5136-3-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.5567F8E2.0072, 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: 6daa249d248493ef30deed59c7332ea9 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 02/13] hw/isa/lpc_ich9.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.41 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: ==25058== 8 bytes in 1 blocks are definitely lost in loss record 623 of 3,473 ==25058== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==25058== by 0x2EB657: malloc_and_trace (vl.c:2556) ==25058== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==25058== by 0x377C27: qemu_extend_irqs (irq.c:55) ==25058== by 0x377CB3: qemu_allocate_irqs (irq.c:64) ==25058== by 0x222338: ich9_lpc_pm_init (lpc_ich9.c:365) ==25058== by 0x255C42: pc_q35_init (pc_q35.c:255) ==25058== by 0x2EFA22: main (vl.c:4249) Since ich9_lpc_pm_init only requests one irq, so let it just call qemu_allocate_irq. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/isa/lpc_ich9.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index dba7585..144b210 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -360,11 +360,8 @@ static void ich9_set_sci(void *opaque, int irq_num, int level) void ich9_lpc_pm_init(PCIDevice *lpc_pci) { ICH9LPCState *lpc = ICH9_LPC_DEVICE(lpc_pci); - qemu_irq *sci_irq; - - sci_irq = qemu_allocate_irqs(ich9_set_sci, lpc, 1); - ich9_pm_init(lpc_pci, &lpc->pm, sci_irq[0]); + ich9_pm_init(lpc_pci, &lpc->pm, qemu_allocate_irq(ich9_set_sci, lpc, 0)); ich9_lpc_reset(&lpc->d.qdev); }