Only modify XtensaConfig within xtensa_register_core(),
when the class is registered, not when it is initialized.

Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
---
Cc: Max Filippov <[email protected]>
---
 target/xtensa/helper.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c
index 2978c471c1f..c4735989714 100644
--- a/target/xtensa/helper.c
+++ b/target/xtensa/helper.c
@@ -173,9 +173,8 @@ static void xtensa_core_class_init(ObjectClass *oc, void 
*data)
 {
     CPUClass *cc = CPU_CLASS(oc);
     XtensaCPUClass *xcc = XTENSA_CPU_CLASS(oc);
-    XtensaConfig *config = data;
+    const XtensaConfig *config = data;
 
-    xtensa_finalize_config(config);
     xcc->config = config;
 
     /*
@@ -189,12 +188,15 @@ static void xtensa_core_class_init(ObjectClass *oc, void 
*data)
 
 void xtensa_register_core(XtensaConfigList *node)
 {
+    XtensaConfig *config = g_memdup2(node->config, sizeof(config));
     TypeInfo type = {
         .parent = TYPE_XTENSA_CPU,
         .class_init = xtensa_core_class_init,
-        .class_data = (void *)node->config,
+        .class_data = config,
     };
 
+    xtensa_finalize_config(config);
+
     node->next = xtensa_cores;
     xtensa_cores = node;
     type.name = g_strdup_printf(XTENSA_CPU_TYPE_NAME("%s"), 
node->config->name);
-- 
2.47.1


Reply via email to