From patchwork Thu May 28 12:08:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49076 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9E26A218EC for ; Thu, 28 May 2015 12:19:05 +0000 (UTC) Received: by wixv7 with SMTP id v7sf13343651wix.0 for ; Thu, 28 May 2015 05:19:04 -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=HdW0kXEYQLAFQ2gqu/1CjWw/zcx9+6Qtbe2iDDzpm3o=; b=MgQwChXAI5AAFw2V4xZ6qhT3oXPcW49j6QBsdawV475ar5lY5sUYeIyKCLEQKl+KZW 9ZUndQlOF3jx1gIBMrQ3p7bc7npjhvbtfhVA2CCTp7P9DhgJGmR+8dy5M9JBF1Oz6lfe dMNwOj8txhs91WZxGmKS3LK7dcrEkxSkYFchhPhvcQkRfSxHbw1MzpEoJpevgo2RPced HTgFKkJjaeLo8YLh5r0QT5YTYsN4HX3xs9hxIce1vFJNU+GrHEPSxUWArEuX9OsFQNWT ooeFauaHZZT39xyunTOSIxehaEp9tsm8A5RwxsmPcsXfHr3QJzmUG4RX7O0e6GH1tF9k mWQg== X-Gm-Message-State: ALoCoQlRqvA1aCjqTpAPse79p1qoGCH96SmWQWJMm6fXKbuLFc0jBPoVCAoyz6NsSejSK6/kTcj6 X-Received: by 10.152.87.140 with SMTP id ay12mr2465133lab.8.1432815544564; Thu, 28 May 2015 05:19:04 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.227 with SMTP id t3ls185876laj.72.gmail; Thu, 28 May 2015 05:19:04 -0700 (PDT) X-Received: by 10.112.163.168 with SMTP id yj8mr2523999lbb.36.1432815544451; Thu, 28 May 2015 05:19:04 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id ei7si1786908lad.156.2015.05.28.05.19.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 05:19:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbcue7 with SMTP id ue7so26913327lbc.0 for ; Thu, 28 May 2015 05:19:04 -0700 (PDT) X-Received: by 10.112.93.37 with SMTP id cr5mr2530349lbb.106.1432815544176; Thu, 28 May 2015 05:19:04 -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 hn6csp1111479lbb; Thu, 28 May 2015 05:19:03 -0700 (PDT) X-Received: by 10.140.135.21 with SMTP id 21mr2822309qhh.89.1432815542933; Thu, 28 May 2015 05:19:02 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id x77si2199571qkx.17.2015.05.28.05.19.02 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 05:19:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Received: from localhost ([::1]:58373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxwm6-0007yX-2j for patch@linaro.org; Thu, 28 May 2015 08:19:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxwe9-0002H4-6f for qemu-devel@nongnu.org; Thu, 28 May 2015 08:10:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxwe4-0003c0-Cp for qemu-devel@nongnu.org; Thu, 28 May 2015 08:10:49 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:45276) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxwe3-0003Yd-5V; Thu, 28 May 2015 08:10:44 -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 COP98101; Thu, 28 May 2015 20:10:31 +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:10:05 +0800 From: Shannon Zhao To: Date: Thu, 28 May 2015 20:08:36 +0800 Message-ID: <1432814932-12608-14-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 13/29] hw/ppc/prep.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.217.176 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: ==22156== 8 bytes in 1 blocks are definitely lost in loss record 469 of 3,966 ==22156== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22156== by 0x337033: malloc_and_trace (vl.c:2556) ==22156== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==22156== by 0x3C0A27: qemu_extend_irqs (irq.c:55) ==22156== by 0x3C0AB3: qemu_allocate_irqs (irq.c:64) ==22156== by 0x26C792: ppc_prep_init (prep.c:628) ==22156== by 0x33B3FE: main (vl.c:4249) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/ppc/prep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 7f52662..310fa71 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -528,7 +528,7 @@ static void ppc_prep_init(MachineState *machine) PCIDevice *pci; ISABus *isa_bus; ISADevice *isa; - qemu_irq *cpu_exit_irq; + qemu_irq cpu_exit_irq; int ppc_boot_device; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; @@ -625,11 +625,11 @@ static void ppc_prep_init(MachineState *machine) /* PCI -> ISA bridge */ pci = pci_create_simple(pci_bus, PCI_DEVFN(1, 0), "i82378"); - cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); + cpu_exit_irq = qemu_allocate_irq(cpu_request_exit, NULL, 0); cpu = POWERPC_CPU(first_cpu); qdev_connect_gpio_out(&pci->qdev, 0, cpu->env.irq_inputs[PPC6xx_INPUT_INT]); - qdev_connect_gpio_out(&pci->qdev, 1, *cpu_exit_irq); + qdev_connect_gpio_out(&pci->qdev, 1, cpu_exit_irq); sysbus_connect_irq(&pcihost->busdev, 0, qdev_get_gpio_in(&pci->qdev, 9)); sysbus_connect_irq(&pcihost->busdev, 1, qdev_get_gpio_in(&pci->qdev, 11)); sysbus_connect_irq(&pcihost->busdev, 2, qdev_get_gpio_in(&pci->qdev, 9));