From patchwork Fri May 29 05:27:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49137 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B7F6B22B3A for ; Fri, 29 May 2015 05:34:13 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf15665741lbb.0 for ; Thu, 28 May 2015 22:34:12 -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=trtSvKrpo3qLDWBODy3ThBzRsHEsw5vgRS1kZ2nmCTM=; b=DBoyNi95ZZJ0imoFXPzorvKaxni05DPIfRsZgWGBnrQjHjjSKUGnA4qZfuuvuu34h+ /TlYditVOAJU89xSUCzSJ2pGZfjk7viqmn6uz0xzHf9O/9RjvCFdN8016x6NvQutaPsO EfBtF5V5LxYog9tZUtI0gZ4itFIW2A3E62Ee5Cku/Da+WjCXzH4v42Un7LRUuK1r/6Ok HteV6QsotHuTiQ0DjO00P0A3PFwSNhy1N2d4cFqawpM/y2gZri54iaQISLe8JrBMja6m vl756Y2o4mTdvn6Bew1JMD7r6YD+qbGt7j8H2v0XTz6tRhcNqoY0U7TDg49HxidVXb+l sTqw== X-Gm-Message-State: ALoCoQmaPUIDbC6FSUGO4xIB9Z+SNjtcvizEcZgQMoKvjaUSQpBMJ/4CQ/tTDUFMFoNSVOj1eos2 X-Received: by 10.112.171.41 with SMTP id ar9mr5848233lbc.24.1432877652722; Thu, 28 May 2015 22:34:12 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.227 with SMTP id lf3ls290024lab.93.gmail; Thu, 28 May 2015 22:34:12 -0700 (PDT) X-Received: by 10.152.27.1 with SMTP id p1mr6128805lag.112.1432877652614; Thu, 28 May 2015 22:34:12 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id pf2si3805359lbc.2.2015.05.28.22.34.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 22:34:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbcmx3 with SMTP id mx3so41746088lbc.1 for ; Thu, 28 May 2015 22:34:12 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr6116449lak.117.1432877652159; Thu, 28 May 2015 22:34:12 -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 hn6csp34904lbb; Thu, 28 May 2015 22:34:11 -0700 (PDT) X-Received: by 10.229.193.7 with SMTP id ds7mr7903769qcb.8.1432877650881; Thu, 28 May 2015 22:34:10 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 68si4677801qhs.39.2015.05.28.22.34.10 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 22:34:10 -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]:33575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCvq-0000Mq-2c for patch@linaro.org; Fri, 29 May 2015 01:34:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCqC-0006PM-CV for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyCq6-0005Dm-U5 for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:20 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:5293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCq6-0005Cv-Cd; Fri, 29 May 2015 01:28:14 -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 CMB71957; Fri, 29 May 2015 13:28:06 +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:58 +0800 From: Shannon Zhao To: Date: Fri, 29 May 2015 13:27:05 +0800 Message-ID: <1432877231-5136-8-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 07/13] hw/ppc/prep.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.181 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 7f52662..998ee2d 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -528,7 +528,6 @@ static void ppc_prep_init(MachineState *machine) PCIDevice *pci; ISABus *isa_bus; ISADevice *isa; - qemu_irq *cpu_exit_irq; int ppc_boot_device; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; @@ -625,11 +624,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 = 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, + qemu_allocate_irq(cpu_request_exit, NULL, 0)); 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));