From patchwork Thu May 28 12:08:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49069 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 330A0218EC for ; Thu, 28 May 2015 12:15:11 +0000 (UTC) Received: by lbbti3 with SMTP id ti3sf10090721lbb.1 for ; Thu, 28 May 2015 05:15:10 -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=hk5+V7v2ciF+46rFqKhpcnWmc5gXiUINqCNVJ39R0gI=; b=cSIkofOoXSWXh+QPteigY2PhRsjDV+2L0Gm26qG2iPRIddHfqKHYhycRPvF8YsASzE sw76yeh2XnQnIQo2J+vpHO0UFBttbPzvtmJsutb1+fCG4HrqPUiXdByUXbWQI9zNN3op StvwWRyzSmKOsKC9MiGICaN7s/ojc5bP1AuNzQzaEa1X/h7AzpnqTbdIwvabIK4LdgFH Uk1SLLRIKFP9DyEGdfnZAcBv7rTAUpUCLSvwlEjc+h2ZGxtrlx+ntP6RUOvX90XRlgHI r5qmDYHwlt+hIQBeqEbJEnQk7pMmEP3EbkE4zJdD95fzozIrq3ryU1IUcv8lYX04pXGs KxQw== X-Gm-Message-State: ALoCoQnF/0sjfvpKuo/Z+8wLxni0y2X1kNRApSlRkdGyUtgHxKXoVQwZTyDzgOn+c1y3pSjAEc4d X-Received: by 10.180.106.136 with SMTP id gu8mr32999364wib.6.1432815310193; Thu, 28 May 2015 05:15:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.3.133 with SMTP id c5ls156975lac.68.gmail; Thu, 28 May 2015 05:15:10 -0700 (PDT) X-Received: by 10.152.27.162 with SMTP id u2mr2434321lag.22.1432815310064; Thu, 28 May 2015 05:15:10 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id kd4si1812100lbc.42.2015.05.28.05.15.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 05:15:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by laat2 with SMTP id t2so30092893laa.1 for ; Thu, 28 May 2015 05:15:09 -0700 (PDT) X-Received: by 10.112.234.200 with SMTP id ug8mr2396844lbc.117.1432815309647; Thu, 28 May 2015 05:15:09 -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 hn6csp1108485lbb; Thu, 28 May 2015 05:15:08 -0700 (PDT) X-Received: by 10.140.96.202 with SMTP id k68mr2663406qge.102.1432815308367; Thu, 28 May 2015 05:15:08 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g1si2177442qcf.19.2015.05.28.05.15.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 05:15:08 -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]:58334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxwiJ-0000qV-Aq for patch@linaro.org; Thu, 28 May 2015 08:15:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxwe3-0002CZ-H5 for qemu-devel@nongnu.org; Thu, 28 May 2015 08:10:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxwdy-0003Vi-Q0 for qemu-devel@nongnu.org; Thu, 28 May 2015 08:10:43 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:45238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxwdy-0003SP-6f; Thu, 28 May 2015 08:10:38 -0400 Received: from 172.24.2.119 (EHLO SZXEML429-HUB.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id COP98089; Thu, 28 May 2015 20:10:28 +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; Thu, 28 May 2015 20:09:57 +0800 From: Shannon Zhao To: Date: Thu, 28 May 2015 20:08:29 +0800 Message-ID: <1432814932-12608-7-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1432814932-12608-1-git-send-email-zhaoshenglong@huawei.com> References: <1432814932-12608-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: 58.251.152.64 Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, mjt@tls.msk.ru, shannon.zhao@linaro.org, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 06/29] hw/isa/i82378.c: Fix memory leak spotted by valgrind 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.44 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: ==32654== 8 bytes in 1 blocks are definitely lost in loss record 476 of 4,036 ==32654== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==32654== by 0x336F47: malloc_and_trace (vl.c:2556) ==32654== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==32654== by 0x3C093B: qemu_extend_irqs (irq.c:55) ==32654== by 0x3C09C7: qemu_allocate_irqs (irq.c:64) ==32654== by 0x3EA4CF: i82378_realize (i82378.c:92) ==32654== by 0x420991: pci_qdev_realize (pci.c:1781) ==32654== by 0x3BD47C: device_set_realized (qdev.c:1058) ==32654== by 0x4A6516: property_set_bool (object.c:1514) ==32654== by 0x4A4E10: object_property_set (object.c:837) ==32654== by 0x4A7132: object_property_set_qobject (qom-qobject.c:24) ==32654== by 0x4A507F: object_property_set_bool (object.c:905) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/isa/i82378.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 9da9dfc..48cc1ae 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -65,7 +65,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) uint8_t *pci_conf; ISABus *isabus; ISADevice *isa; - qemu_irq *out0_irq; + qemu_irq out0_irq; pci_conf = pci->config; pci_set_word(pci_conf + PCI_COMMAND, @@ -89,10 +89,10 @@ static void i82378_realize(PCIDevice *pci, Error **errp) */ /* Workaround the fact that i8259 is not qdev'ified... */ - out0_irq = qemu_allocate_irqs(i82378_request_out0_irq, s, 1); + out0_irq = qemu_allocate_irq(i82378_request_out0_irq, s, 0); /* 2 82C59 (irq) */ - s->i8259 = i8259_init(isabus, *out0_irq); + s->i8259 = i8259_init(isabus, out0_irq); isa_bus_irqs(isabus, s->i8259); /* 1 82C54 (pit) */