From nobody Fri Dec 19 15:56:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583426668; cv=none; d=zohomail.com; s=zohoarc; b=QcJNI8tqjzEL/TdPCdx/1kiPtb9F/43XuGFIBksEeQCMjCJp9AyrjuE/eoznlYvxXXAO//PRdbOexIO41dau6h4nuK2/+BHDMOzhpFmBbEDy+ehUc8gM66MBcr65rFrcB2wWvysd5NgR7sE+sylD26Uk9dz141kSdr+9yS/T5VE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583426668; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WBubcm43hZcBFxzyb7e4AboA5LBFrKCvg3PbaEHjM5U=; b=CLCLqKeqb1/Z+jsap8Ha9lWT5ZSlIlzDc44kn7hA9BmZMLZ1533ZumY9RmDch7as9dLiX5G2fPIZtY8i/7SAWLvRS1Iugqgn31/L0Ne/nFYlL/ttrjzKx4KwEJ7uMTiv+LaFcG3ykL9arJhMkZN4x35FlN556pPbntbJ+3rrcyA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583426668536619.0258642724768; Thu, 5 Mar 2020 08:44:28 -0800 (PST) Received: from localhost ([::1]:52706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9tbn-0007em-Ff for importer@patchew.org; Thu, 05 Mar 2020 11:44:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59214) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9tP6-0003Ru-1p for qemu-devel@nongnu.org; Thu, 05 Mar 2020 11:31:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9tP4-0002Ge-Ob for qemu-devel@nongnu.org; Thu, 05 Mar 2020 11:31:19 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:38032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9tP4-0002F7-Hf for qemu-devel@nongnu.org; Thu, 05 Mar 2020 11:31:18 -0500 Received: by mail-wm1-x331.google.com with SMTP id u9so6432649wml.3 for ; Thu, 05 Mar 2020 08:31:18 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w22sm10310729wmk.34.2020.03.05.08.31.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2020 08:31:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WBubcm43hZcBFxzyb7e4AboA5LBFrKCvg3PbaEHjM5U=; b=N0a1uH7Y2UzJakzCzlzWALcLXVi7TOQhgU/Ojxs0yB/A2UKDXyD+TnMhNp+Z1WoAR/ P00rHiPFL5XHauhlBbVTRLCamnyXlFWVo2O4E2IfZOnxhxhh9dqD/Hv2yhI0T/CoY8Z4 oPU6hAauS3NYvAIm+cWShrWRZhzMbRXtkxJfO9nr/4rmrgJJXqBNNeUo0it5kU2vMwvg /1boaYjFjCUKNPAl09CJy3Ku/iEuvCQ5FZRzdQxTPv1+TWd9bUre9gtK/Tv3CBi26ETR ualmbs0aDzCqoZzwGCr1uaYUl7Njyyx49SOoCbX/xELMb/jaDpq2pkrPTWRHuJyWjxX1 n5+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WBubcm43hZcBFxzyb7e4AboA5LBFrKCvg3PbaEHjM5U=; b=kW2wGqTF8nK+jtqwKsgUYXEd8xLX14dpq9mgEgGb2Hc6ZhlCwVpUhNqTSSfJ4otHEA rS7MLCKgg9yWmyFNXEEMEbyfUHEkZpD+yFv2Y0dwhODcX8sINlkJ6mqir9TiKRoOsbxl oHYwBzmEjqHuJ9f3NRyHYnNyGVtYx8/XOLYPwHWwlrJTxF7oC6o5TcCkU6VtQUJ7jKQb 3da/3KVMCX3neOOySUD6ueD9n3/fGo8bJ0c3m/SEZLjoMKcGGPX5A7GgBeR2Sf+4br/G Qls4/BC57kxiNwVcWO9GEegfSbMjMKUkKAegT0LC/PjP4Z37dFf+jS2tcO2vZasL02/4 7YpQ== X-Gm-Message-State: ANhLgQ2tDJDYAOHQa93ysj0eF8GS0UXdrh6991l8me6iu0fpA/7bm9Cz h7udbNhgfRPHjK4ws86HSOvLXz4jv/oeHA== X-Google-Smtp-Source: ADFU+vsFkDCCNv8FBWpbIXcTB9AD6o+4pIUSR+N/D6PT7jlsrB9CIlhIOod+G9IiW+h4MpH9ujGBcg== X-Received: by 2002:a05:600c:2255:: with SMTP id a21mr6282568wmm.91.1583425876750; Thu, 05 Mar 2020 08:31:16 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/37] hw/arm/strongarm: move timer_new from init() into realize() to avoid memleaks Date: Thu, 5 Mar 2020 16:30:36 +0000 Message-Id: <20200305163100.22912-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200305163100.22912-1-peter.maydell@linaro.org> References: <20200305163100.22912-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Pan Nengyuan There are some memleaks when we call 'device_list_properties'. This patch m= ove timer_new from init into realize to fix it. Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Message-id: 20200227025055.14341-5-pannengyuan@huawei.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/strongarm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index cd8a99aaf2e..3010d765bb7 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -399,9 +399,6 @@ static void strongarm_rtc_init(Object *obj) s->last_rcnr =3D (uint32_t) mktimegm(&tm); s->last_hz =3D qemu_clock_get_ms(rtc_clock); =20 - s->rtc_alarm =3D timer_new_ms(rtc_clock, strongarm_rtc_alarm_tick, s); - s->rtc_hz =3D timer_new_ms(rtc_clock, strongarm_rtc_hz_tick, s); - sysbus_init_irq(dev, &s->rtc_irq); sysbus_init_irq(dev, &s->rtc_hz_irq); =20 @@ -410,6 +407,13 @@ static void strongarm_rtc_init(Object *obj) sysbus_init_mmio(dev, &s->iomem); } =20 +static void strongarm_rtc_realize(DeviceState *dev, Error **errp) +{ + StrongARMRTCState *s =3D STRONGARM_RTC(dev); + s->rtc_alarm =3D timer_new_ms(rtc_clock, strongarm_rtc_alarm_tick, s); + s->rtc_hz =3D timer_new_ms(rtc_clock, strongarm_rtc_hz_tick, s); +} + static int strongarm_rtc_pre_save(void *opaque) { StrongARMRTCState *s =3D opaque; @@ -451,6 +455,7 @@ static void strongarm_rtc_sysbus_class_init(ObjectClass= *klass, void *data) =20 dc->desc =3D "StrongARM RTC Controller"; dc->vmsd =3D &vmstate_strongarm_rtc_regs; + dc->realize =3D strongarm_rtc_realize; } =20 static const TypeInfo strongarm_rtc_sysbus_info =3D { @@ -1240,15 +1245,16 @@ static void strongarm_uart_init(Object *obj) "uart", 0x10000); sysbus_init_mmio(dev, &s->iomem); sysbus_init_irq(dev, &s->irq); - - s->rx_timeout_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, strongarm_uar= t_rx_to, s); - s->tx_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, strongarm_uart_tx, s); } =20 static void strongarm_uart_realize(DeviceState *dev, Error **errp) { StrongARMUARTState *s =3D STRONGARM_UART(dev); =20 + s->rx_timeout_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, + strongarm_uart_rx_to, + s); + s->tx_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, strongarm_uart_tx, s); qemu_chr_fe_set_handlers(&s->chr, strongarm_uart_can_receive, strongarm_uart_receive, --=20 2.20.1