From patchwork Fri May 29 05:27:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49131 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9951122B3A for ; Fri, 29 May 2015 05:31:06 +0000 (UTC) Received: by wgv5 with SMTP id 5sf10775052wgv.0 for ; Thu, 28 May 2015 22:31:05 -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=vatghaV3qHwpa8PPlN8UYFu9o4BWROKt8Cjo0PlGeGQ=; b=kt28N8ldrQ5aEUUZiiziAhX8fO6EA4gcCf0sOFxoQkO7/Kj2nh4mCFzX9bYXwTH88a h8IhDAIm/xNr0jB9LKLRbFxLP1SQ1+blp/i+VFvIrzYhUw/GFmxielEwcVGjIGhuznqS Yat5vGM3Csae6oNSCdOimnbUDYGH1wbP/JDH4RkDioeKQFD9U77dUwj/QRhadUGsiPyn 9mDhSMESwTreTlZlGDP5LediUOnnFGT0R7WZ26gG8nSX75/fUKCs9k8YAyrkHxAape8O qOIMspej81JClU8Y4KpZ0nnvAjzDRC9nCGbUQu1Z9FzZW0OJOe5lUKkysR+aHJybYQW/ hFjA== X-Gm-Message-State: ALoCoQlx9FL12Y7B4E52+SQ6empSH+ZdQysNDFjcPvBFqMhBYkJG2ddc7V+kperrNmo8NBNy+Tse X-Received: by 10.112.189.131 with SMTP id gi3mr5835152lbc.6.1432877465641; Thu, 28 May 2015 22:31:05 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.201 with SMTP id p9ls296609lae.42.gmail; Thu, 28 May 2015 22:31:05 -0700 (PDT) X-Received: by 10.112.214.202 with SMTP id oc10mr6356485lbc.80.1432877465396; Thu, 28 May 2015 22:31:05 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id is4si3772332lac.103.2015.05.28.22.31.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 22:31:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbbqq2 with SMTP id qq2so41680218lbb.3 for ; Thu, 28 May 2015 22:31:05 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr6418398lbc.32.1432877465125; Thu, 28 May 2015 22:31:05 -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 hn6csp33531lbb; Thu, 28 May 2015 22:31:04 -0700 (PDT) X-Received: by 10.55.42.130 with SMTP id q2mr12661757qkq.20.1432877463924; Thu, 28 May 2015 22:31:03 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 49si1189260qgy.56.2015.05.28.22.31.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 May 2015 22:31:03 -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]:33540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCsp-0002ie-3I for patch@linaro.org; Fri, 29 May 2015 01:31:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCq9-0006Lo-Am 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-0005DO-CS for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:17 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:21637) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCq3-0005CR-Nj; 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 BGS73942; 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:53 +0800 From: Shannon Zhao To: Date: Fri, 29 May 2015 13:27:01 +0800 Message-ID: <1432877231-5136-4-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.0A020203.5567F8E2.0053, 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: d5106f96c5460bb23d8b367868793788 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 03/13] hw/isa/i82378.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.169 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 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 9da9dfc..fcf97d8 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -65,7 +65,6 @@ static void i82378_realize(PCIDevice *pci, Error **errp) uint8_t *pci_conf; ISABus *isabus; ISADevice *isa; - qemu_irq *out0_irq; pci_conf = pci->config; pci_set_word(pci_conf + PCI_COMMAND, @@ -88,11 +87,9 @@ static void i82378_realize(PCIDevice *pci, Error **errp) All devices accept byte access only, except timer */ - /* Workaround the fact that i8259 is not qdev'ified... */ - out0_irq = qemu_allocate_irqs(i82378_request_out0_irq, s, 1); - /* 2 82C59 (irq) */ - s->i8259 = i8259_init(isabus, *out0_irq); + s->i8259 = i8259_init(isabus, + qemu_allocate_irq(i82378_request_out0_irq, s, 0)); isa_bus_irqs(isabus, s->i8259); /* 1 82C54 (pit) */