diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-03 03:12:35 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:45 +0200 |
| commit | e59be77a5b88510ceca87335ee9f241ded566ae2 (patch) | |
| tree | 5b904fbdaf9ba014c0f37e948f5930d4021f91c2 /target-sparc/cpu.c | |
| parent | c356a1bcc0b609125cb540dae3796a3618441300 (diff) | |
| download | focaccia-qemu-e59be77a5b88510ceca87335ee9f241ded566ae2.tar.gz focaccia-qemu-e59be77a5b88510ceca87335ee9f241ded566ae2.zip | |
target-sparc: Let cpu_sparc_init() return SPARCCPU
Make include paths for cpu-qom.h consistent, so that SPARCCPU can be used in cpu.h. Turn cpu_init macro into a static inline function returning CPUSPARCState for backwards compatibility. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-sparc/cpu.c')
| -rw-r--r-- | target-sparc/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c index 7ac6bdb058..8ccac23865 100644 --- a/target-sparc/cpu.c +++ b/target-sparc/cpu.c @@ -111,7 +111,7 @@ static int cpu_sparc_register(CPUSPARCState *env, const char *cpu_model) return 0; } -CPUSPARCState *cpu_sparc_init(const char *cpu_model) +SPARCCPU *cpu_sparc_init(const char *cpu_model) { SPARCCPU *cpu; CPUSPARCState *env; @@ -129,7 +129,7 @@ CPUSPARCState *cpu_sparc_init(const char *cpu_model) } qemu_init_vcpu(env); - return env; + return cpu; } void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu) |