Skip to content

Commit d30d590

Browse files
committed
hw/misc/xlnx-versal-cfu: destroy fifo in finalize
Since the TYPE_XNLX_VERSAL_CFU_FDRO device creates a FIFO in its instance_init method, we must destroy the FIFO in instance_finalize to avoid a memory leak for the QOM introspection "instantiate-examine-finalize" cycle: Direct leak of 8192 byte(s) in 1 object(s) allocated from: #0 0x55ec89eae7ee in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294d7ee) (BuildId: 6d508874816cc47d17c8dd775e8f809ae520e8cb) #1 0x7f697018f738 in g_malloc debian/build/deb/../../../glib/gmem.c:128:13 #2 0x55ec8d98d98d in fifo8_create util/fifo8.c:27:18 #3 0x55ec8aa2a624 in fifo32_create /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/include/qemu/fifo32.h:35:5 #4 0x55ec8aa2a33c in cfu_fdro_init hw/misc/xlnx-versal-cfu.c:397:5 qemu#5 0x55ec8ce75da1 in object_init_with_type qom/object.c:420:9 qemu#6 0x55ec8ce5d07b in object_initialize_with_type qom/object.c:562:5 qemu#7 0x55ec8ce5e91d in object_new_with_type qom/object.c:782:5 qemu#8 0x55ec8ce5e9f1 in object_new qom/object.c:797:12 qemu#9 0x55ec8d65c81d in qmp_device_list_properties qom/qom-qmp-cmds.c:144:11 Signed-off-by: Peter Maydell <[email protected]> Reviewed-by: Edgar E. Iglesias <[email protected]> Reviewed-by: Francisco Iglesias <[email protected]> Reviewed-by: Alistair Francis <[email protected]> Message-id: [email protected]
1 parent 7c824b4 commit d30d590

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

hw/misc/xlnx-versal-cfu.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,13 @@ static void cfu_fdro_init(Object *obj)
397397
fifo32_create(&s->fdro_data, 8 * KiB / sizeof(uint32_t));
398398
}
399399

400+
static void cfu_fdro_finalize(Object *obj)
401+
{
402+
XlnxVersalCFUFDRO *s = XLNX_VERSAL_CFU_FDRO(obj);
403+
404+
fifo32_destroy(&s->fdro_data);
405+
}
406+
400407
static void cfu_fdro_reset_enter(Object *obj, ResetType type)
401408
{
402409
XlnxVersalCFUFDRO *s = XLNX_VERSAL_CFU_FDRO(obj);
@@ -539,6 +546,7 @@ static const TypeInfo cfu_fdro_info = {
539546
.instance_size = sizeof(XlnxVersalCFUFDRO),
540547
.class_init = cfu_fdro_class_init,
541548
.instance_init = cfu_fdro_init,
549+
.instance_finalize = cfu_fdro_finalize,
542550
.interfaces = (InterfaceInfo[]) {
543551
{ TYPE_XLNX_CFI_IF },
544552
{ }

0 commit comments

Comments
 (0)