From nobody Thu Nov 13 20:44:01 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1582771422; cv=none; d=zohomail.com; s=zohoarc; b=UxTiYWdPwfoY1fijaiDpztSFHCh7THA2hE6sVI1lN+6gbpC2FxSXQje9rp0gWnm+yVs7TQZzhtCYAGnT0cEyKW11bYje1SNC+1SJPRBiOGAd2BUJWuYxF+AVAn25AyAO+Hn68R1Oe25hdymYSaBLPVV4Lut4Jie+Z9/WGvvqqiU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582771422; h=Content-Type:Content-Transfer-Encoding:Cc: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=WqQY6qD1kwnAdaSRJROtAbfcE6gUoFD6xv01yhxFkK4=; b=etJB6uFmCQ5wdrgTc5QU9bfSCJbtJdu7xY6kj98YtK3fgvq1dmla+YvZoxz+TcjtuQT52s3HbjM4XLON5p8iEMQtUbS5a5krt9DJLnwT5UaeAjUknKpFaNub6E7y0dbfnOBLX67JYHmu1M5wgX/dHEaDj3ZOmQUZ1Ouv7LWbLsE= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582771422038932.3350069002139; Wed, 26 Feb 2020 18:43:42 -0800 (PST) Received: from localhost ([::1]:53050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j799I-0008KB-WE for importer@patchew.org; Wed, 26 Feb 2020 21:43:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60177) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j791V-00084m-Va for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j791U-0001m2-Mg for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:37 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:39478 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j791O-0001P2-VQ; Wed, 26 Feb 2020 21:35:31 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id B7EF74C9367B712C157E; Thu, 27 Feb 2020 10:35:26 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Thu, 27 Feb 2020 10:35:15 +0800 From: Pan Nengyuan To: Subject: [PATCH v3 1/6] s390x: fix memleaks in cpu_finalize Date: Thu, 27 Feb 2020 10:50:50 +0800 Message-ID: <20200227025055.14341-2-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200227025055.14341-1-pannengyuan@huawei.com> References: <20200227025055.14341-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 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: , Cc: zhang.zhanghailiang@huawei.com, David Hildenbrand , Cornelia Huck , Pan Nengyuan , qemu-devel@nongnu.org, qemu-s390x@nongnu.org, qemu-arm@nongnu.org, euler.robot@huawei.com, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch fix memleaks when we call tests/qtest/cpu-plug-test on s390x. Th= e leak stack is as follow: Direct leak of 48 byte(s) in 1 object(s) allocated from: #0 0x7fb43c7cd970 in __interceptor_calloc (/lib64/libasan.so.5+0xef970) #1 0x7fb43be2149d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5249d) #2 0x558ba96da716 in timer_new_full /mnt/sdb/qemu-new/qemu/include/qemu= /timer.h:530 #3 0x558ba96da716 in timer_new /mnt/sdb/qemu-new/qemu/include/qemu/time= r.h:551 #4 0x558ba96da716 in timer_new_ns /mnt/sdb/qemu-new/qemu/include/qemu/t= imer.h:569 #5 0x558ba96da716 in s390_cpu_initfn /mnt/sdb/qemu-new/qemu/target/s390= x/cpu.c:285 #6 0x558ba9c969ab in object_init_with_type /mnt/sdb/qemu-new/qemu/qom/o= bject.c:372 #7 0x558ba9c9eb5f in object_initialize_with_type /mnt/sdb/qemu-new/qemu= /qom/object.c:516 #8 0x558ba9c9f053 in object_new_with_type /mnt/sdb/qemu-new/qemu/qom/ob= ject.c:684 #9 0x558ba967ede6 in s390x_new_cpu /mnt/sdb/qemu-new/qemu/hw/s390x/s390= -virtio-ccw.c:64 #10 0x558ba99764b3 in hmp_cpu_add /mnt/sdb/qemu-new/qemu/hw/core/machin= e-hmp-cmds.c:57 #11 0x558ba9b1c27f in handle_hmp_command /mnt/sdb/qemu-new/qemu/monitor= /hmp.c:1082 #12 0x558ba96c1b02 in qmp_human_monitor_command /mnt/sdb/qemu-new/qemu/= monitor/misc.c:142 Reported-by: Euler Robot Signed-off-by: Pan Nengyuan --- Cc: Richard Henderson Cc: David Hildenbrand Cc: Cornelia Huck Cc: qemu-s390x@nongnu.org --- v2->v1: - Similarly to other cleanups, move timer_new into realize(Suggested by Phi= lippe Mathieu-Daud=C3=A9) v3->v2: - Also do the timer_free in unrealize, it seems more balance. --- target/s390x/cpu.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index cf84d307c6..cc63c9db22 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -170,7 +170,12 @@ static void s390_cpu_realizefn(DeviceState *dev, Error= **errp) S390CPUClass *scc =3D S390_CPU_GET_CLASS(dev); #if !defined(CONFIG_USER_ONLY) S390CPU *cpu =3D S390_CPU(dev); + cpu->env.tod_timer =3D + timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_tod_timer, cpu); + cpu->env.cpu_timer =3D + timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu); #endif + Error *err =3D NULL; =20 /* the model has to be realized before qemu_init_vcpu() due to kvm */ @@ -227,6 +232,18 @@ out: error_propagate(errp, err); } =20 +static void s390_cpu_unrealizefn(DeviceState *dev, Error **errp) +{ +#if !defined(CONFIG_USER_ONLY) + S390CPU *cpu =3D S390_CPU(dev); + + timer_del(cpu->env.tod_timer); + timer_del(cpu->env.cpu_timer); + timer_free(cpu->env.tod_timer); + timer_free(cpu->env.cpu_timer); +#endif +} + static GuestPanicInformation *s390_cpu_get_crash_info(CPUState *cs) { GuestPanicInformation *panic_info; @@ -279,10 +296,6 @@ static void s390_cpu_initfn(Object *obj) s390_cpu_get_crash_info_qom, NULL, NULL, NULL, NUL= L); s390_cpu_model_register_props(obj); #if !defined(CONFIG_USER_ONLY) - cpu->env.tod_timer =3D - timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_tod_timer, cpu); - cpu->env.cpu_timer =3D - timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu); s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu); #endif } @@ -453,6 +466,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *= data) =20 device_class_set_parent_realize(dc, s390_cpu_realizefn, &scc->parent_realize); + dc->unrealize =3D s390_cpu_unrealizefn; device_class_set_props(dc, s390x_cpu_properties); dc->user_creatable =3D true; =20 --=20 2.18.2 From nobody Thu Nov 13 20:44:01 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1582771116; cv=none; d=zohomail.com; s=zohoarc; b=VwDEJqObycHDXoFiGh42foDqNSdjtB1HNwlrZSqitmIIQkqR1SWytdbrhKJlB3GwIeYWXLHxVXX+udwqblZ/wOjBoD68KFS0h5Sm7/t7Uvvr/wh9uYk44r7GPQUsPLu8cME0V+fvT648oZsFYfbnDQhTo6qNSFK8WUAuXavdJwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582771116; h=Content-Type:Cc: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=9uShoF//ypKdNFU7H/k8XOjnROEvEb/GT/eve+8SSdw=; b=URncGq5VbNL6OgofN8qcyk2+oHNouNOiWCnbUEIEFRwQMYHYRU6dUWmgyKKW2kjI3ec6SvWBc2xbWePWu+LuWobLltcjhVNvFNyVdMAXGbbwGiHujzO2c4ssOFIPuZ/75C7sg2fPVJLS07l2l7ieB2QF8IN6+RCYiCCaTebwAcI= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582771116443524.0909804836432; Wed, 26 Feb 2020 18:38:36 -0800 (PST) Received: from localhost ([::1]:52968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j794N-0003wG-DK for importer@patchew.org; Wed, 26 Feb 2020 21:38:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60108) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j791S-0007xg-AV for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j791R-0001dc-7F for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:34 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:3172 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j791O-0001O8-JC; Wed, 26 Feb 2020 21:35:30 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 89955B16684D25F05FF8; Thu, 27 Feb 2020 10:35:26 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Thu, 27 Feb 2020 10:35:17 +0800 From: Pan Nengyuan To: Subject: [PATCH v3 2/6] hw/arm/pxa2xx: move timer_new from init() into realize() to avoid memleaks Date: Thu, 27 Feb 2020 10:50:51 +0800 Message-ID: <20200227025055.14341-3-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200227025055.14341-1-pannengyuan@huawei.com> References: <20200227025055.14341-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.190 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: , Cc: zhang.zhanghailiang@huawei.com, Pan Nengyuan , qemu-devel@nongnu.org, qemu-arm@nongnu.org, euler.robot@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- Cc: Andrzej Zaborowski --- hw/arm/pxa2xx.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index b33f8f1351..56a36202d7 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -1134,18 +1134,22 @@ static void pxa2xx_rtc_init(Object *obj) s->last_rtcpicr =3D 0; s->last_hz =3D s->last_sw =3D s->last_pi =3D qemu_clock_get_ms(rtc_clo= ck); =20 + sysbus_init_irq(dev, &s->rtc_irq); + + memory_region_init_io(&s->iomem, obj, &pxa2xx_rtc_ops, s, + "pxa2xx-rtc", 0x10000); + sysbus_init_mmio(dev, &s->iomem); +} + +static void pxa2xx_rtc_realize(DeviceState *dev, Error **errp) +{ + PXA2xxRTCState *s =3D PXA2XX_RTC(dev); s->rtc_hz =3D timer_new_ms(rtc_clock, pxa2xx_rtc_hz_tick, s); s->rtc_rdal1 =3D timer_new_ms(rtc_clock, pxa2xx_rtc_rdal1_tick, s); s->rtc_rdal2 =3D timer_new_ms(rtc_clock, pxa2xx_rtc_rdal2_tick, s); s->rtc_swal1 =3D timer_new_ms(rtc_clock, pxa2xx_rtc_swal1_tick, s); s->rtc_swal2 =3D timer_new_ms(rtc_clock, pxa2xx_rtc_swal2_tick, s); s->rtc_pi =3D timer_new_ms(rtc_clock, pxa2xx_rtc_pi_tick, s); - - sysbus_init_irq(dev, &s->rtc_irq); - - memory_region_init_io(&s->iomem, obj, &pxa2xx_rtc_ops, s, - "pxa2xx-rtc", 0x10000); - sysbus_init_mmio(dev, &s->iomem); } =20 static int pxa2xx_rtc_pre_save(void *opaque) @@ -1203,6 +1207,7 @@ static void pxa2xx_rtc_sysbus_class_init(ObjectClass = *klass, void *data) =20 dc->desc =3D "PXA2xx RTC Controller"; dc->vmsd =3D &vmstate_pxa2xx_rtc_regs; + dc->realize =3D pxa2xx_rtc_realize; } =20 static const TypeInfo pxa2xx_rtc_sysbus_info =3D { --=20 2.18.2 From nobody Thu Nov 13 20:44:01 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1582770994; cv=none; d=zohomail.com; s=zohoarc; b=oFj64vnu5csw/XYjWMMMwQseIiupywKiiI7zXZm1wVK+O2LaP/1vFANWLZV6eRUZ78LdEag1HyxvQ6XAY+wMuVEsp5ZcHenbkFQtPAJnn4QQLsS80H4q3+c1z99P5aH3YrNJ8bBP6KZD1TZPJdHrCEA6X9acZCjp7rCNv7WV1Z4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582770994; h=Content-Type:Cc: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=Iv105vkxIe0Uy2naZRZUTtJcw1gfTsk/nHorpSEHeHM=; b=dzM2RX8qOCA6dymTfKQLMeyTaeaFsbE+0p0bQYP0+xpc4aMXk93IHDTiMeg/Qt8epEox6fqmsMrQwDCVWIf1qdGcoLaPzXHFZH0SVpAvGPnRDX2bfJ3ITlBEGXy3/D9jmRJKSb92+e0rVowz88CkbgwYXHgbnxw0Nm4FaChXxDk= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582770994711693.9846970225738; Wed, 26 Feb 2020 18:36:34 -0800 (PST) Received: from localhost ([::1]:52948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j792O-00012e-G6 for importer@patchew.org; Wed, 26 Feb 2020 21:36:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60083) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j791R-0007wl-Bg for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j791Q-0001aO-AD for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:33 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:3173 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j791O-0001OE-0L; Wed, 26 Feb 2020 21:35:30 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 8DEEA4DC289EFDFADFF7; Thu, 27 Feb 2020 10:35:26 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Thu, 27 Feb 2020 10:35:18 +0800 From: Pan Nengyuan To: Subject: [PATCH v3 3/6] hw/arm/spitz: move timer_new from init() into realize() to avoid memleaks Date: Thu, 27 Feb 2020 10:50:52 +0800 Message-ID: <20200227025055.14341-4-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200227025055.14341-1-pannengyuan@huawei.com> References: <20200227025055.14341-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.190 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: , Cc: zhang.zhanghailiang@huawei.com, Pan Nengyuan , qemu-devel@nongnu.org, qemu-arm@nongnu.org, euler.robot@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- Cc: Andrzej Zaborowski --- hw/arm/spitz.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index e001088103..cbfa6934cf 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -524,11 +524,16 @@ static void spitz_keyboard_init(Object *obj) =20 spitz_keyboard_pre_map(s); =20 - s->kbdtimer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, spitz_keyboard_tick, = s); qdev_init_gpio_in(dev, spitz_keyboard_strobe, SPITZ_KEY_STROBE_NUM); qdev_init_gpio_out(dev, s->sense, SPITZ_KEY_SENSE_NUM); } =20 +static void spitz_keyboard_realize(DeviceState *dev, Error **errp) +{ + SpitzKeyboardState *s =3D SPITZ_KEYBOARD(dev); + s->kbdtimer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, spitz_keyboard_tick, = s); +} + /* LCD backlight controller */ =20 #define LCDTG_RESCTL 0x00 @@ -1115,6 +1120,7 @@ static void spitz_keyboard_class_init(ObjectClass *kl= ass, void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->vmsd =3D &vmstate_spitz_kbd; + dc->realize =3D spitz_keyboard_realize; } =20 static const TypeInfo spitz_keyboard_info =3D { --=20 2.18.2 From nobody Thu Nov 13 20:44:01 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1582771011; cv=none; d=zohomail.com; s=zohoarc; b=M/aT/tH82htDu3IifAFC1KWwXVMCiiBWeTNTg88Xd7O4LwtNUrOvImizMsNGCSKrvpn2Hrh1UKv946qlBB66pK3H5e3Rt82A7ppuMGc3gn4A5SmMfhji0M+CPGyUx+xjvnirvfc+7HiuaLqoC0MWf65YTrTAOrbP326IV0OOlJ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582771011; h=Content-Type:Cc: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=OcctjUq1mh6dsDK+AG7FcjMvK08p4/jeTXH4R0VwdhQ=; b=aiuWfmHJRGzCZoXTWgojuhbFb85CMnYAYf7n8+mq3hwGqTLoVLzep2JNT8h6AbFasdZF2ToKYu78d73L+JX/0Zngo1E8PyFB6434I6GtwZv203J8J6UavqT3dh1Vw9PV1C/AnY4esOTsskfpCm0DjMg0VqpDwwRk8a/2VmWw0KM= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582771011292270.59533936319394; Wed, 26 Feb 2020 18:36:51 -0800 (PST) Received: from localhost ([::1]:52952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j792g-0001f8-5k for importer@patchew.org; Wed, 26 Feb 2020 21:36:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60088) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j791R-0007wn-Jm for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j791Q-0001ah-Hb for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:33 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:3171 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j791O-0001O6-4z; Wed, 26 Feb 2020 21:35:30 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 854A496A2BE4FCDFB2BD; Thu, 27 Feb 2020 10:35:26 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Thu, 27 Feb 2020 10:35:19 +0800 From: Pan Nengyuan To: Subject: [PATCH v3 4/6] hw/arm/strongarm: move timer_new from init() into realize() to avoid memleaks Date: Thu, 27 Feb 2020 10:50:53 +0800 Message-ID: <20200227025055.14341-5-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200227025055.14341-1-pannengyuan@huawei.com> References: <20200227025055.14341-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.190 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: , Cc: euler.robot@huawei.com, qemu-arm@nongnu.org, Pan Nengyuan , qemu-devel@nongnu.org, zhang.zhanghailiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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 cd8a99aaf2..3010d765bb 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.18.2 From nobody Thu Nov 13 20:44:01 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1582771232; cv=none; d=zohomail.com; s=zohoarc; b=GHGN7DPJgs+lNHnG6m37zx0f15qRrRgJqWvBPl1Uf69aTk/Vi4b2DT+sr4mvSiYG7zK8ETzp5OGvZs2bnnOfMJJ/6RNYigUY9uzFLY8Vv1ke7wuLSljsfwH648qJIo04AOc69xDvztGeLwLNYMtqz7pEyhaSUWl58dEEf8WODYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582771232; h=Content-Type:Cc: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=UVK3kE5ftprVdEVs6FpI0ue5ySl3DKFSTudG/sSM1jM=; b=InwWrlyLdNUJwp3DJWwXUMpjVvtybhZ9svDGguoDSdGftWcniMqHu64awe8ESy8CSNEdm8DKFaYtR3qsAsOSZpkSiaSVKVSxs1dRrXquwsHgGqTCn4dC+inqADdk5nxqkgoWLvuKjA4+KC62bSsxNAJCbDJz5hmit8aQl+uC89U= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582771232827124.09529645403757; Wed, 26 Feb 2020 18:40:32 -0800 (PST) Received: from localhost ([::1]:53014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j796F-0005gQ-PF for importer@patchew.org; Wed, 26 Feb 2020 21:40:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60169) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j791V-00083v-FG for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j791U-0001lG-Cn for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:37 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:3174 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j791R-0001ZC-MH; Wed, 26 Feb 2020 21:35:33 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 9D6DC12A53F73219C1E5; Thu, 27 Feb 2020 10:35:31 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Thu, 27 Feb 2020 10:35:21 +0800 From: Pan Nengyuan To: Subject: [PATCH v3 5/6] hw/misc/mos6522: move timer_new from init() into realize() to avoid memleaks Date: Thu, 27 Feb 2020 10:50:54 +0800 Message-ID: <20200227025055.14341-6-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200227025055.14341-1-pannengyuan@huawei.com> References: <20200227025055.14341-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.190 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: , Cc: zhang.zhanghailiang@huawei.com, Pan Nengyuan , Laurent Vivier , qemu-devel@nongnu.org, qemu-arm@nongnu.org, euler.robot@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There are some memleaks when we call 'device_list_properties'. This patch m= ove timer_new from init into realize to fix it. Meanwhile, add calls to mos6522_realize() in mac_via_realize to make this m= ove to be valid. Reported-by: Euler Robot Signed-off-by: Pan Nengyuan --- Cc: Laurent Vivier --- v2->v1: - no changes in this patch. v3->v2: - remove null check in reset, and add calls to mos6522_realize() in mac_via= _realize to make this move to be valid. --- hw/misc/mac_via.c | 5 +++++ hw/misc/mos6522.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index b7d0012794..1d72d4ef35 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -879,6 +879,11 @@ static void mac_via_realize(DeviceState *dev, Error **= errp) sysbus_init_child_obj(OBJECT(dev), "via2", &m->mos6522_via2, sizeof(m->mos6522_via2), TYPE_MOS6522_Q800_VIA2); =20 + object_property_set_bool(OBJECT(&m->mos6522_via1), true, "realized", + &error_abort); + object_property_set_bool(OBJECT(&m->mos6522_via2), true, "realized", + &error_abort); + /* Pass through mos6522 output IRQs */ ms =3D MOS6522(&m->mos6522_via1); object_property_add_alias(OBJECT(dev), "irq[0]", OBJECT(ms), diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 19e154b870..c1cd154a84 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -485,6 +485,11 @@ static void mos6522_init(Object *obj) for (i =3D 0; i < ARRAY_SIZE(s->timers); i++) { s->timers[i].index =3D i; } +} + +static void mos6522_realize(DeviceState *dev, Error **errp) +{ + MOS6522State *s =3D MOS6522(dev); =20 s->timers[0].timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, mos6522_timer1= , s); s->timers[1].timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, mos6522_timer2= , s); @@ -502,6 +507,7 @@ static void mos6522_class_init(ObjectClass *oc, void *d= ata) =20 dc->reset =3D mos6522_reset; dc->vmsd =3D &vmstate_mos6522; + dc->realize =3D mos6522_realize; device_class_set_props(dc, mos6522_properties); mdc->parent_reset =3D dc->reset; mdc->set_sr_int =3D mos6522_set_sr_int; --=20 2.18.2 From nobody Thu Nov 13 20:44:01 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1582771107; cv=none; d=zohomail.com; s=zohoarc; b=P6hfJgeqe+MewElLcZkH/mMfl1PzJq6hCYLodwij+Vr5u5LPXl1tTEo0juDIEyVYokTq+r7BVmocXQVn1+89rT4iVIpXdTUfINVtaP2qe7KzDE1dBLXUcWo3DhxaLoRj0Q7Q3Jm5MUIWuyNg56sVNs918HwhFFlnmg1n/2Vz9pE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582771107; h=Content-Type:Cc: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=p/F+4x4UkdW18ehpRURv5+muCDGDvBF/a+QAMr/dAYk=; b=LvqHQts3w32D4iVzOcQx6NfBgazyh2+fo3+Q+/J4bOXxU7YeIV+tqwO0om9bQ0l295MbG92s8OnTgNb6QmmMT1zEiYKXt3Pc5/90/MOMCxi9T/h1TqKodsvcY2dEj351fTMYl3L0f3XAT362ifQzuLGiqYDcduhnsDbhh9gPusM= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158277110738050.35315775871766; Wed, 26 Feb 2020 18:38:27 -0800 (PST) Received: from localhost ([::1]:52966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j794E-0003qH-Bg for importer@patchew.org; Wed, 26 Feb 2020 21:38:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60165) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j791V-00083l-Cm for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j791U-0001lB-Au for qemu-devel@nongnu.org; Wed, 26 Feb 2020 21:35:37 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:3175 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j791R-0001ZP-MZ; Wed, 26 Feb 2020 21:35:33 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id A23DBA7A5288C2477CB3; Thu, 27 Feb 2020 10:35:31 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Thu, 27 Feb 2020 10:35:22 +0800 From: Pan Nengyuan To: Subject: [PATCH v3 6/6] hw/timer/cadence_ttc: move timer_new from init() into realize() to avoid memleaks Date: Thu, 27 Feb 2020 10:50:55 +0800 Message-ID: <20200227025055.14341-7-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200227025055.14341-1-pannengyuan@huawei.com> References: <20200227025055.14341-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.190 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: , Cc: zhang.zhanghailiang@huawei.com, Alistair Francis , Pan Nengyuan , qemu-devel@nongnu.org, qemu-arm@nongnu.org, euler.robot@huawei.com, "Edgar E. Iglesias" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Alistair Francis --- Cc: "Edgar E. Iglesias" Cc: Alistair Francis --- hw/timer/cadence_ttc.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c index 5e3128c1e3..b0ba6b2bba 100644 --- a/hw/timer/cadence_ttc.c +++ b/hw/timer/cadence_ttc.c @@ -412,16 +412,21 @@ static void cadence_timer_init(uint32_t freq, Cadence= TimerState *s) static void cadence_ttc_init(Object *obj) { CadenceTTCState *s =3D CADENCE_TTC(obj); + + memory_region_init_io(&s->iomem, obj, &cadence_ttc_ops, s, + "timer", 0x1000); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem); +} + +static void cadence_ttc_realize(DeviceState *dev, Error **errp) +{ + CadenceTTCState *s =3D CADENCE_TTC(dev); int i; =20 for (i =3D 0; i < 3; ++i) { cadence_timer_init(133000000, &s->timer[i]); - sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->timer[i].irq); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->timer[i].irq); } - - memory_region_init_io(&s->iomem, obj, &cadence_ttc_ops, s, - "timer", 0x1000); - sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem); } =20 static int cadence_timer_pre_save(void *opaque) @@ -479,6 +484,7 @@ static void cadence_ttc_class_init(ObjectClass *klass, = void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->vmsd =3D &vmstate_cadence_ttc; + dc->realize =3D cadence_ttc_realize; } =20 static const TypeInfo cadence_ttc_info =3D { --=20 2.18.2