diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-06 12:41:53 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:41 +0200 |
| commit | 15be3171392a14cb90abd89ac7310681556f736e (patch) | |
| tree | aa94158ba64f8b1ec057cb6cfbe79f63373d0a74 /target-xtensa/helper.c | |
| parent | f6932a867d862a5d39506701e9b9d8abcdf1f4ff (diff) | |
| download | qemu-15be3171392a14cb90abd89ac7310681556f736e.tar.gz | |
target-xtensa: Let cpu_xtensa_init() return XtensaCPU
Make the include paths for cpu-qom.h consistent to allow using XtensaCPU
in cpu.h.
Turn cpu_init macro into a static inline function returning
CPUXtensaState for backwards compatibility.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'target-xtensa/helper.c')
| -rw-r--r-- | target-xtensa/helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index 2094227843..e6cb3fe91e 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -80,7 +80,7 @@ static void breakpoint_handler(CPUXtensaState *env) } } -CPUXtensaState *cpu_xtensa_init(const char *cpu_model) +XtensaCPU *cpu_xtensa_init(const char *cpu_model) { static int tcg_inited; static int debug_handler_inited; @@ -116,7 +116,7 @@ CPUXtensaState *cpu_xtensa_init(const char *cpu_model) xtensa_irq_init(env); qemu_init_vcpu(env); - return env; + return cpu; } |