From nobody Tue Nov 18 01:26:53 2025 Delivered-To: importer@patchew.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=1607069909; cv=none; d=zohomail.com; s=zohoarc; b=QRWtFzwbEvfoHybX59NM8tg1orR7kHRLK8bgIvKWTHNJKlfqDCJ/Zh+gXwPxPNPo8G4wzd/CnUuwrc6huaZy+Xl4fTkj9E0EkIAugeFYpaCtcugBYtfaAHfj5nR/l96ghgfnqd5njGeYtqNnrC6IYoID/9ZIc4p+h/uiiWVrfT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607069909; 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=+hbyvLpkH/GM6K9RtJA409fSRDKW5VHW8FeBEDHRxIA=; b=HhRYTF/hT/pB5yMnB6lsnKGEAvDKKcm3uL+U0gvaPtV6OjX4/3tNChrHqWhoYZ2OzhynOZFQAoPSOjqEwWurfiWZht7X7iN7WJL6Rfuv5B8aqyhPBHwcz9rbr8jqrQAtTeWIL1HiYeYv6fb24FdD4rUAQgko4F2HaOgVEe7jw+c= 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 16070699096845.465735480159196; Fri, 4 Dec 2020 00:18:29 -0800 (PST) Received: from localhost ([::1]:55404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kl6IO-0002Fv-FT for importer@patchew.org; Fri, 04 Dec 2020 03:18:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kl6Du-0006zt-7o; Fri, 04 Dec 2020 03:13:51 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2469) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kl6Do-00076u-73; Fri, 04 Dec 2020 03:13:49 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CnQSH5GFwzLyxy; Fri, 4 Dec 2020 16:13:03 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Fri, 4 Dec 2020 16:13:28 +0800 From: Gan Qixin To: , Subject: [PATCH 1/3] pl031: Use timer_free() in the finalize function to avoid memleaks Date: Fri, 4 Dec 2020 16:12:07 +0800 Message-ID: <20201204081209.360524-2-ganqixin@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201204081209.360524-1-ganqixin@huawei.com> References: <20201204081209.360524-1-ganqixin@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected 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; Received-SPF: pass client-ip=45.249.212.191; envelope-from=ganqixin@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, thuth@redhat.com, zhang.zhanghailiang@huawei.com, Gan Qixin , Euler Robot , kuhn.chenqun@huawei.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When running device-introspect-test, a memory leak occurred in the pl031_in= it function, this patch use timer_free() in the finalize function to fix it. ASAN shows memory leak stack: Direct leak of 48 byte(s) in 1 object(s) allocated from: #0 0xffffab97e1f0 in __interceptor_calloc (/lib64/libasan.so.5+0xee1f0) #1 0xffffab256800 in g_malloc0 (/lib64/libglib-2.0.so.0+0x56800) #2 0xaaabf5621cfc in timer_new_full qemu/include/qemu/timer.h:523 #3 0xaaabf5621cfc in timer_new qemu/include/qemu/timer.h:544 #4 0xaaabf5621cfc in timer_new_ns qemu/include/qemu/timer.h:562 #5 0xaaabf5621cfc in pl031_init qemu/hw/rtc/pl031.c:194 #6 0xaaabf6339f6c in object_initialize_with_type qemu/qom/object.c:515 #7 0xaaabf633a1e0 in object_new_with_type qemu/qom/object.c:729 #8 0xaaabf6375e40 in qmp_device_list_properties qemu/qom/qom-qmp-cmds.c= :153 #9 0xaaabf5a95540 in qdev_device_help qemu/softmmu/qdev-monitor.c:283 #10 0xaaabf5a96940 in qmp_device_add qemu/softmmu/qdev-monitor.c:801 #11 0xaaabf5a96e70 in hmp_device_add qemu/softmmu/qdev-monitor.c:916 #12 0xaaabf5ac0a2c in handle_hmp_command qemu/monitor/hmp.c:1100 Reported-by: Euler Robot Signed-off-by: Gan Qixin Reviewed-by: Peter Maydell --- Cc: Peter Maydell --- hw/rtc/pl031.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index ae47f09635..2ea3dc1281 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -194,6 +194,14 @@ static void pl031_init(Object *obj) s->timer =3D timer_new_ns(rtc_clock, pl031_interrupt, s); } =20 +static void pl031_finalize(Object *obj) +{ + PL031State *s =3D PL031(obj); + + timer_del(s->timer); + timer_free(s->timer); +} + static int pl031_pre_save(void *opaque) { PL031State *s =3D opaque; @@ -325,11 +333,12 @@ static void pl031_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo pl031_info =3D { - .name =3D TYPE_PL031, - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(PL031State), - .instance_init =3D pl031_init, - .class_init =3D pl031_class_init, + .name =3D TYPE_PL031, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(PL031State), + .instance_init =3D pl031_init, + .instance_finalize =3D pl031_finalize, + .class_init =3D pl031_class_init, }; =20 static void pl031_register_types(void) --=20 2.27.0 From nobody Tue Nov 18 01:26:53 2025 Delivered-To: importer@patchew.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=1607069761; cv=none; d=zohomail.com; s=zohoarc; b=UdnDYp/lFWu3z3SiClBdU/TbrYZ3e+78u8JpBg+QnhoHuzgVgj2cuFwj+M6fPztISeNoPsCoLpADy96rRKlGiO2c0sJQJNGIT6Cc55Qk06m+FydmMeVWH3lDq8Tm+b4JQUvmGuqI6iIe77q85frGY3Og/C6lNbL1Dp2qfd5FZHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607069761; 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=xhmCj9zhz6gpex417/U6yHrNTKYdtFS7yOAsSga2Vno=; b=XDE8R3XvPX4p8TN8NaabH2U9QQvDOHtuQsvV8Z8ZNnW2VKNkhzfopVmHeuucQkCYoqBKFX6IoeHFxly06MZCsuT9FBKL25XjuI9dJv1ifFgOb+dMS3gpd8SztvnndkyFWgjC/6XPZ4W/OMBMALxme2vn9LPt7SefsmkGozozJyE= 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 1607069761852772.4578892457463; Fri, 4 Dec 2020 00:16:01 -0800 (PST) Received: from localhost ([::1]:50922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kl6G0-0000MT-MZ for importer@patchew.org; Fri, 04 Dec 2020 03:16:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kl6Dq-0006yp-0t; Fri, 04 Dec 2020 03:13:46 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2468) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kl6Dm-00076s-WB; Fri, 04 Dec 2020 03:13:45 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CnQSH53VjzLytt; Fri, 4 Dec 2020 16:13:03 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Fri, 4 Dec 2020 16:13:31 +0800 From: Gan Qixin To: , Subject: [PATCH 2/3] misc/mos6522: Use timer_free() in the finalize function to avoid memleak Date: Fri, 4 Dec 2020 16:12:08 +0800 Message-ID: <20201204081209.360524-3-ganqixin@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201204081209.360524-1-ganqixin@huawei.com> References: <20201204081209.360524-1-ganqixin@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected 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; Received-SPF: pass client-ip=45.249.212.191; envelope-from=ganqixin@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, thuth@redhat.com, zhang.zhanghailiang@huawei.com, Gan Qixin , Euler Robot , kuhn.chenqun@huawei.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When running device-introspect-test, a memory leak occurred in the mos6522_= init function, this patch use timer_free() in the finalize function to fix it. ASAN shows memory leak stack: Direct leak of 96 byte(s) in 2 object(s) allocated from: #0 0xfffd5fe9e1f0 in __interceptor_calloc (/lib64/libasan.so.5+0xee1f0) #1 0xfffd5f7b6800 in g_malloc0 (/lib64/libglib-2.0.so.0+0x56800) #2 0xaaae50303d0c in timer_new_full qemu/include/qemu/timer.h:523 #3 0xaaae50303d0c in timer_new qemu/include/qemu/timer.h:544 #4 0xaaae50303d0c in timer_new_ns qemu/include/qemu/timer.h:562 #5 0xaaae50303d0c in mos6522_init qemu/hw/misc/mos6522.c:490 #6 0xaaae50b77d70 in object_init_with_type qemu/qom/object.c:371 #7 0xaaae50b7ae84 in object_initialize_with_type qemu/qom/object.c:515 #8 0xaaae50b7b0f8 in object_new_with_type qemu/qom/object.c:729 #9 0xaaae50bb6d58 in qmp_device_list_properties qemu/qom/qom-qmp-cmds.c= :153 #10 0xaaae50d7e1dc in qmp_marshal_device_list_properties qemu/qapi/qapi= -commands-qdev.c:59 #11 0xaaae50dc87a0 in do_qmp_dispatch_bh qemu/qapi/qmp-dispatch.c:110 #12 0xaaae50d931a0 in aio_bh_call qemu/util/async.c:136 Reported-by: Euler Robot Signed-off-by: Gan Qixin Acked-by: David Gibson --- Cc: David Gibson --- hw/misc/mos6522.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index ac4cd1d58e..0236eeece1 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -490,6 +490,16 @@ static void mos6522_init(Object *obj) s->timers[1].timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, mos6522_timer2= , s); } =20 +static void mos6522_finalize(Object *obj) +{ + MOS6522State *s =3D MOS6522(obj); + + timer_del(s->timers[0].timer); + timer_free(s->timers[0].timer); + timer_del(s->timers[1].timer); + timer_free(s->timers[1].timer); +} + static Property mos6522_properties[] =3D { DEFINE_PROP_UINT64("frequency", MOS6522State, frequency, 0), DEFINE_PROP_END_OF_LIST() @@ -519,6 +529,7 @@ static const TypeInfo mos6522_type_info =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MOS6522State), .instance_init =3D mos6522_init, + .instance_finalize =3D mos6522_finalize, .abstract =3D true, .class_size =3D sizeof(MOS6522DeviceClass), .class_init =3D mos6522_class_init, --=20 2.27.0 From nobody Tue Nov 18 01:26:53 2025 Delivered-To: importer@patchew.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=1607070171; cv=none; d=zohomail.com; s=zohoarc; b=kAKSoPy3UR7hkCGwjtUOmALxG1i1rfVKv3jrJBJjfev3DAqYQXVgSTYQ3tdwi+3BTglLi9j1C4fp9Wq5r7BqREvcJeuMi3Ja0K5Yoqdjhe/y9Vq1UMXj2zoEAChgBUlenUEJBwfT+oZSYCmjjEePK6QyE5UFJ64ttkVrO7C16M0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607070171; 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=f6IiTORPAQvUFCz+cvt9V/xCkV0R2+sE/5+YfasOms4=; b=OliEiLO8d3D2VXBlSBW126jA9TO7VZcAmhxm/tVcXMSp8MamVlT9xjdvmOU4myUxcXw17xdyeowXoorfQlGSJyNoKnilVH2CFyuez4aTo8MztlGRL25p68Aox3teC5L4C8Upo2WcEV+v+V5dXguXW772erhlyvWCfRU5IQ6UgZs= 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 1607070171046317.93868986621874; Fri, 4 Dec 2020 00:22:51 -0800 (PST) Received: from localhost ([::1]:34764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kl6Mb-0005f3-P1 for importer@patchew.org; Fri, 04 Dec 2020 03:22:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kl6Dz-00072A-Am; Fri, 04 Dec 2020 03:13:55 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2988) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kl6Dx-0007AE-1K; Fri, 04 Dec 2020 03:13:55 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CnQSf2V64zhmJP; Fri, 4 Dec 2020 16:13:22 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Fri, 4 Dec 2020 16:13:39 +0800 From: Gan Qixin To: , Subject: [PATCH 3/3] s390x/cpu: Use timer_free() in the finalize function to avoid memleaks Date: Fri, 4 Dec 2020 16:12:09 +0800 Message-ID: <20201204081209.360524-4-ganqixin@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201204081209.360524-1-ganqixin@huawei.com> References: <20201204081209.360524-1-ganqixin@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected 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; Received-SPF: pass client-ip=45.249.212.191; envelope-from=ganqixin@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, thuth@redhat.com, zhang.zhanghailiang@huawei.com, Gan Qixin , Euler Robot , kuhn.chenqun@huawei.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When running device-introspect-test, a memory leak occurred in the s390_cpu= _initfn function, this patch use timer_free() in the finalize function to fix it. ASAN shows memory leak stack: Direct leak of 3552 byte(s) in 74 object(s) allocated from: #0 0xfffeb3d4e1f0 in __interceptor_calloc (/lib64/libasan.so.5+0xee1f0) #1 0xfffeb36e6800 in g_malloc0 (/lib64/libglib-2.0.so.0+0x56800) #2 0xaaad51a8f9c4 in timer_new_full qemu/include/qemu/timer.h:523 #3 0xaaad51a8f9c4 in timer_new qemu/include/qemu/timer.h:544 #4 0xaaad51a8f9c4 in timer_new_ns qemu/include/qemu/timer.h:562 #5 0xaaad51a8f9c4 in s390_cpu_initfn qemu/target/s390x/cpu.c:304 #6 0xaaad51e00f58 in object_init_with_type qemu/qom/object.c:371 #7 0xaaad51e0406c in object_initialize_with_type qemu/qom/object.c:515 #8 0xaaad51e042e0 in object_new_with_type qemu/qom/object.c:729 #9 0xaaad51e3ff40 in qmp_device_list_properties qemu/qom/qom-qmp-cmds.c= :153 #10 0xaaad51910518 in qdev_device_help qemu/softmmu/qdev-monitor.c:283 #11 0xaaad51911918 in qmp_device_add qemu/softmmu/qdev-monitor.c:801 #12 0xaaad51911e48 in hmp_device_add qemu/softmmu/qdev-monitor.c:916 Reported-by: Euler Robot Signed-off-by: Gan Qixin Reviewed-by: David Hildenbrand --- Cc: Thomas Huth --- target/s390x/cpu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 7b66718c44..8a734c2f8c 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -313,6 +313,11 @@ static void s390_cpu_finalize(Object *obj) #if !defined(CONFIG_USER_ONLY) S390CPU *cpu =3D S390_CPU(obj); =20 + timer_del(cpu->env.tod_timer); + timer_free(cpu->env.tod_timer); + timer_del(cpu->env.cpu_timer); + timer_free(cpu->env.cpu_timer); + qemu_unregister_reset(s390_cpu_machine_reset_cb, cpu); g_free(cpu->irqstate); #endif --=20 2.27.0