From patchwork Wed Jun 17 03:00:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 485264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F1206140293 for ; Wed, 17 Jun 2015 13:01:41 +1000 (AEST) Received: from localhost ([::1]:43951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z53bf-0001sJ-EB for incoming@patchwork.ozlabs.org; Tue, 16 Jun 2015 23:01:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z53b2-0000uH-7U for qemu-devel@nongnu.org; Tue, 16 Jun 2015 23:01:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z53b1-0005xX-3s for qemu-devel@nongnu.org; Tue, 16 Jun 2015 23:01:00 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:52530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z53at-0005hu-BN; Tue, 16 Jun 2015 23:00:51 -0400 Received: from 172.24.2.119 (EHLO szxeml434-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BHU84682; Wed, 17 Jun 2015 11:00:44 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml434-hub.china.huawei.com (10.82.67.225) with Microsoft SMTP Server id 14.3.158.1; Wed, 17 Jun 2015 11:00:30 +0800 From: Shannon Zhao To: Date: Wed, 17 Jun 2015 11:00:00 +0800 Message-ID: <1434510002-6976-7-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1434510002-6976-1-git-send-email-zhaoshenglong@huawei.com> References: <1434510002-6976-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.0A020201.5580E2DC.00D1, 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: 30158c6c866eb6b261c8e8dc65f31034 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, mjt@tls.msk.ru, shannon.zhao@linaro.org Subject: [Qemu-devel] [PATCH v3 6/8] hw/arm/palm.c: Store irq array in MachineState to fix memory leak 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/arm/palm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 7f1cfb8..6fe28e5 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -156,7 +156,7 @@ static void palmte_onoff_gpios(void *opaque, int line, int level) } } -static void palmte_gpio_setup(struct omap_mpu_state_s *cpu) +static qemu_irq *palmte_gpio_setup(struct omap_mpu_state_s *cpu) { qemu_irq *misc_gpio; @@ -183,6 +183,8 @@ static void palmte_gpio_setup(struct omap_mpu_state_s *cpu) qemu_irq_raise(omap_mpuio_in_get(cpu->mpuio)[6]); qemu_irq_raise(omap_mpuio_in_get(cpu->mpuio)[7]); qemu_irq_raise(omap_mpuio_in_get(cpu->mpuio)[11]); + + return misc_gpio; } static struct arm_boot_info palmte_binfo = { @@ -236,7 +238,7 @@ static void palmte_init(MachineState *machine) qemu_add_kbd_event_handler(palmte_button_event, mpu); - palmte_gpio_setup(mpu); + machine->irqs = palmte_gpio_setup(mpu); /* Setup initial (reset) machine state */ if (nb_option_roms) {