From patchwork Fri May 29 05:27:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49138 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 D6BCA22B3A for ; Fri, 29 May 2015 05:35:18 +0000 (UTC) Received: by wifq9 with SMTP id q9sf2401414wif.3 for ; Thu, 28 May 2015 22:35:18 -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=rifrOqzZxjRU/IxUCktH0+8hEd6553lOEVpH7Ij4DPk=; b=DSV/DVXuoG8Xq3qUOx1dImG3XSQWiNy8xs7OAeRzSwOIrFcimwh96HRfC1zTrZxQbO vUwgESZqDOgkS02RAch8o1SupQOip4uJ9JHX2+7ziuSZDUdqh3s/+sXd1dwM/KvEVlqh IrmxTdeHMhK1aXbt/YiLD8JvVQRGjb0JSsqtShNsTjkES6XupUwfJZMky3ckV9z6jhbx B/An33jZ96O7dbEwhqmI4gGJNjTChX9NvQEzFoaFye84ztAJXBj2ppviD6lzzrazY1bF 6bl3XEIgb8gwpOO8Mebb6zNyqpREPS98xfax00t2I304Cd3npDndz7bBE/LgxVPsU2yX ylsw== X-Gm-Message-State: ALoCoQmdGHWy7p9Tu1hawzTBzRZF0PCIypndiSYd25cOODSvAsrWo2/ZKsXfnXxHI/rFsyTAiALD X-Received: by 10.180.84.70 with SMTP id w6mr1126692wiy.4.1432877718148; Thu, 28 May 2015 22:35:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.65 with SMTP id r1ls50350lag.61.gmail; Thu, 28 May 2015 22:35:18 -0700 (PDT) X-Received: by 10.112.42.16 with SMTP id j16mr6103506lbl.98.1432877718025; Thu, 28 May 2015 22:35:18 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id xa2si3763857lbb.156.2015.05.28.22.35.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 22:35:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbcmx3 with SMTP id mx3so41756991lbc.1 for ; Thu, 28 May 2015 22:35:17 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr6119967lak.117.1432877717942; Thu, 28 May 2015 22:35:17 -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 hn6csp35380lbb; Thu, 28 May 2015 22:35:17 -0700 (PDT) X-Received: by 10.141.18.136 with SMTP id u130mr7665909qhd.54.1432877716681; Thu, 28 May 2015 22:35:16 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f46si4695822qgd.11.2015.05.28.22.35.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 22:35:16 -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]:33600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCwt-0002Kf-QQ for patch@linaro.org; Fri, 29 May 2015 01:35:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCqF-0006Vm-63 for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyCqD-0005Hv-RM for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:23 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:5356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCqD-0005GN-9I; Fri, 29 May 2015 01:28:21 -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 CMB71966; Fri, 29 May 2015 13:28:15 +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:05 +0800 From: Shannon Zhao To: Date: Fri, 29 May 2015 13:27:10 +0800 Message-ID: <1432877231-5136-13-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 12/13] hw/arm/nseries.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.177 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: ==4835== 8 bytes in 1 blocks are definitely lost in loss record 509 of 3,278 ==4835== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==4835== by 0x354793: malloc_and_trace (vl.c:2556) ==4835== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==4835== by 0x3ED98F: qemu_extend_irqs (irq.c:55) ==4835== by 0x3EDA1B: qemu_allocate_irqs (irq.c:64) ==4835== by 0x280261: n8x0_gpio_setup (nseries.c:136) ==4835== by 0x2830AB: n8x0_init (nseries.c:1337) ==4835== by 0x2832D6: n800_init (nseries.c:1409) ==4835== by 0x358B5E: main (vl.c:4249) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/arm/nseries.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index d243159..a659e85 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -133,9 +133,8 @@ static void n800_mmc_cs_cb(void *opaque, int line, int level) static void n8x0_gpio_setup(struct n800_s *s) { - qemu_irq *mmc_cs = qemu_allocate_irqs(n800_mmc_cs_cb, s->mpu->mmc, 1); - qdev_connect_gpio_out(s->mpu->gpio, N8X0_MMC_CS_GPIO, mmc_cs[0]); - + qdev_connect_gpio_out(s->mpu->gpio, N8X0_MMC_CS_GPIO, + qemu_allocate_irq(n800_mmc_cs_cb, s->mpu->mmc, 0)); qemu_irq_lower(qdev_get_gpio_in(s->mpu->gpio, N800_BAT_COVER_GPIO)); }