motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/nvram/xlnx-zynqmp-efuse: Call register_finalize_block

Browse source 
The TYPE_XLNX_ZYNQMP_EFUSE device creates a register block with
register_init_block32() in its instance_init method; we must
therefore destroy it in our instance_finalize method to avoid a leak
in the QOM introspection "init-inspect-finalize" lifecycle:

Direct leak of 304 byte(s) in 1 object(s) allocated from:
    #0 0x55f3ff5839d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294d9d8) (BuildId: 23cf931c66865a71b6cc4da95156d03bc106fa72)
    #1 0x7f3f31c6bc50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13
    #2 0x55f3ff9b8c5d in register_init_block hw/core/register.c:248:34
    #3 0x55f3ff9b96be in register_init_block32 hw/core/register.c:299:12
    #4 0x55f4005e5b25 in efuse_ctrl_init hw/nvram/xlnx-versal-efuse-ctrl.c:718:9
    #5 0x55f40254afb1 in object_init_with_type qom/object.c:420:9
    #6 0x55f40253228b in object_initialize_with_type qom/object.c:562:5
    #7 0x55f402533b2d in object_new_with_type qom/object.c:782:5
    #8 0x55f402533c01 in object_new qom/object.c:797:12
    #9 0x55f402d31a2d in qmp_device_list_properties qom/qom-qmp-cmds.c:144:11

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
Reviewed-by: Francisco Iglesias <francisco.iglesias@amd.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20240822162127.705879-5-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-09-03 17:22:18 +01:00
parent 4a87373f28
commit 431d4d2acc
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hw/nvram/xlnx-zynqmp-efuse.c
View file

@ -803,9 +803,8 @@ static void zynqmp_efuse_init(Object *obj)
{ {
XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(obj); XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
RegisterInfoArray *reg_array;
reg_array = s->reg_array =
register_init_block32(DEVICE(obj), zynqmp_efuse_regs_info, register_init_block32(DEVICE(obj), zynqmp_efuse_regs_info,
ARRAY_SIZE(zynqmp_efuse_regs_info), ARRAY_SIZE(zynqmp_efuse_regs_info),
s->regs_info, s->regs, s->regs_info, s->regs,
@ -813,10 +812,17 @@ static void zynqmp_efuse_init(Object *obj)
ZYNQMP_EFUSE_ERR_DEBUG, ZYNQMP_EFUSE_ERR_DEBUG,
R_MAX * 4); R_MAX * 4);
sysbus_init_mmio(sbd, &reg_array->mem); sysbus_init_mmio(sbd, &s->reg_array->mem);
sysbus_init_irq(sbd, &s->irq); sysbus_init_irq(sbd, &s->irq);
} }
static void zynqmp_efuse_finalize(Object *obj)
{
XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(obj);
register_finalize_block(s->reg_array);
}
static const VMStateDescription vmstate_efuse = { static const VMStateDescription vmstate_efuse = {
.name = TYPE_XLNX_ZYNQMP_EFUSE, .name = TYPE_XLNX_ZYNQMP_EFUSE,
.version_id = 1, .version_id = 1,
@ -853,6 +859,7 @@ static const TypeInfo efuse_info = {
.instance_size = sizeof(XlnxZynqMPEFuse), .instance_size = sizeof(XlnxZynqMPEFuse),
.class_init = zynqmp_efuse_class_init, .class_init = zynqmp_efuse_class_init,
.instance_init = zynqmp_efuse_init, .instance_init = zynqmp_efuse_init,
.instance_finalize = zynqmp_efuse_finalize,
}; };
static void efuse_register_types(void) static void efuse_register_types(void)

1
include/hw/nvram/xlnx-zynqmp-efuse.h
View file

@ -37,6 +37,7 @@ struct XlnxZynqMPEFuse {
qemu_irq irq; qemu_irq irq;
XlnxEFuse *efuse; XlnxEFuse *efuse;
RegisterInfoArray *reg_array;
uint32_t regs[XLNX_ZYNQMP_EFUSE_R_MAX]; uint32_t regs[XLNX_ZYNQMP_EFUSE_R_MAX];
RegisterInfo regs_info[XLNX_ZYNQMP_EFUSE_R_MAX]; RegisterInfo regs_info[XLNX_ZYNQMP_EFUSE_R_MAX];
}; };