Patchwork [RFC,05/20] alpha: convert cpu_init to QOM

login
register
mail settings
Submitter Eduardo Habkost
Date Dec. 18, 2012, 8:03 p.m.
Message ID <1355861053-11460-6-git-send-email-ehabkost@redhat.com>
Download mbox | patch
Permalink /patch/207195/
State New
Headers show

Comments

Eduardo Habkost - Dec. 18, 2012, 8:03 p.m.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target-alpha/cpu.h       | 5 ++---
 target-alpha/translate.c | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

Patch

diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
index c04d436..a34cf0e 100644
--- a/target-alpha/cpu.h
+++ b/target-alpha/cpu.h
@@ -290,8 +290,7 @@  struct CPUAlphaState {
     int implver;
 };
 
-#define cpu_init(m) ENV_GET_CPU(old_cpu_init(m))
-#define old_cpu_init cpu_alpha_init
+#define cpu_init cpu_alpha_init
 #define cpu_exec cpu_alpha_exec
 #define cpu_gen_code cpu_alpha_gen_code
 #define cpu_signal_handler cpu_alpha_signal_handler
@@ -428,7 +427,7 @@  enum {
     IR_ZERO = 31,
 };
 
-CPUAlphaState * cpu_alpha_init (const char *cpu_model);
+CPUState *cpu_alpha_init(const char *cpu_model);
 int cpu_alpha_exec(CPUAlphaState *s);
 /* you can call this signal handler from your SIGBUS and SIGSEGV
    signal handlers to inform the virtual CPU of exceptions. non zero
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 71fe1a1..ef51296 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -3517,7 +3517,7 @@  static const struct cpu_def_t cpu_defs[] = {
 				| AMASK_MVI | AMASK_TRAP | AMASK_PREFETCH), }
 };
 
-CPUAlphaState * cpu_alpha_init (const char *cpu_model)
+CPUState *cpu_alpha_init(const char *cpu_model)
 {
     AlphaCPU *cpu;
     CPUAlphaState *env;
@@ -3546,7 +3546,7 @@  CPUAlphaState * cpu_alpha_init (const char *cpu_model)
     env->cpu_model_str = cpu_model;
 
     qemu_init_vcpu(env);
-    return env;
+    return CPU(cpu);
 }
 
 void restore_state_to_opc(CPUAlphaState *env, TranslationBlock *tb, int pc_pos)