From nobody Thu Nov 13 22:13:55 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