66 lines
2.2 KiB
Diff
66 lines
2.2 KiB
Diff
|
From d8685a2aca40ad07ecab1da84ec97f6384b26a66 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 4 Mar 2024 01:46:13 -0800
|
||
|
|
Subject: [PATCH] hw/nvram/xlnx-efuse-ctrl: Free XlnxVersalEFuseCtrl[]
|
||
|
|
"pg0-lock" array
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Commit 0be6bfac62 ("qdev: Implement variable length array properties")
|
||
|
|
added the DEFINE_PROP_ARRAY() macro with the following comment:
|
||
|
|
|
||
|
|
* It is the responsibility of the device deinit code to free the
|
||
|
|
* @_arrayfield memory.
|
||
|
|
|
||
|
|
Commit 9e4aa1fafe added:
|
||
|
|
|
||
|
|
DEFINE_PROP_ARRAY("pg0-lock",
|
||
|
|
XlnxVersalEFuseCtrl, extra_pg0_lock_n16,
|
||
|
|
extra_pg0_lock_spec, qdev_prop_uint16, uint16_t),
|
||
|
|
|
||
|
|
but forgot to free the 'extra_pg0_lock_spec' array. Do it in the
|
||
|
|
instance_finalize() handler.
|
||
|
|
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Fixes: 9e4aa1fafe ("hw/nvram: Xilinx Versal eFuse device") # v6.2.0+
|
||
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Message-id: 20231121174051.63038-6-philmd@linaro.org
|
||
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
||
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||
|
|
(cherry picked from commit 4f10c66077e39969940d928077560665e155cac8)
|
||
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/nvram/xlnx-versal-efuse-ctrl.c | 8 ++++++++
|
||
|
|
1 file changed, 8 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse-ctrl.c
|
||
|
|
index b35ba65ab5..2d2dc09526 100644
|
||
|
|
--- a/hw/nvram/xlnx-versal-efuse-ctrl.c
|
||
|
|
+++ b/hw/nvram/xlnx-versal-efuse-ctrl.c
|
||
|
|
@@ -725,6 +725,13 @@ static void efuse_ctrl_init(Object *obj)
|
||
|
|
sysbus_init_irq(sbd, &s->irq_efuse_imr);
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void efuse_ctrl_finalize(Object *obj)
|
||
|
|
+{
|
||
|
|
+ XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj);
|
||
|
|
+
|
||
|
|
+ g_free(s->extra_pg0_lock_spec);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static const VMStateDescription vmstate_efuse_ctrl = {
|
||
|
|
.name = TYPE_XLNX_VERSAL_EFUSE_CTRL,
|
||
|
|
.version_id = 1,
|
||
|
|
@@ -762,6 +769,7 @@ static const TypeInfo efuse_ctrl_info = {
|
||
|
|
.instance_size = sizeof(XlnxVersalEFuseCtrl),
|
||
|
|
.class_init = efuse_ctrl_class_init,
|
||
|
|
.instance_init = efuse_ctrl_init,
|
||
|
|
+ .instance_finalize = efuse_ctrl_finalize,
|
||
|
|
};
|
||
|
|
|
||
|
|
static void efuse_ctrl_register_types(void)
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|