commit a4633e16d77bd1cf0c25e500d15943499b94f2f9
author Andreas Färber <afaerber@suse.de> Wed Apr 11 18:24:48 2012 +0200
committer Max Filippov <jcmvbkbc@gmail.com> Sat Apr 14 03:48:08 2012 +0400
tree b065c94b19193050b6137be021c39a60cb2b0cbc
parent 7d6b9f0a3838632b4c553e0a387af0bbdf4297c0

target-xtensa: QOM'ify CPU

Embed CPUXtensaState as first member of XtensaCPU.
Let CPUClass::reset() call cpu_state_reset() for now.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

target-xtensa/helper.c

diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c
index dab135c..20338e6 100644
--- a/target-xtensa/helper.c
+++ b/target-xtensa/helper.c
@@ -95,6 +95,7 @@
 {
     static int tcg_inited;
     static int debug_handler_inited;
+    XtensaCPU *cpu;
     CPUXtensaState *env;
     const XtensaConfig *config = NULL;
     XtensaConfigList *core = xtensa_cores;
@@ -109,7 +110,8 @@
         return NULL;
     }
 
-    env = g_malloc0(sizeof(*env));
+    cpu = XTENSA_CPU(object_new(TYPE_XTENSA_CPU));
+    env = &cpu->env;
     env->config = config;
     cpu_exec_init(env);