summary refs log tree commit diff stats
path: root/target-i386/helper.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-02 18:42:46 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:42 +0200
commitb47ed9969fb12527c40aa507e165061c20e21836 (patch)
tree0887d754c5705191efed46b9cb3b66b4c50f9380 /target-i386/helper.c
parent232fc23bed97f92b939d5b2802a481c1dea5991b (diff)
downloadfocaccia-qemu-b47ed9969fb12527c40aa507e165061c20e21836.tar.gz
focaccia-qemu-b47ed9969fb12527c40aa507e165061c20e21836.zip
target-i386: Let cpu_x86_init() return X86CPU
Turn cpu_init macro into a static inline function returning CPUX86State
for backwards compatibility.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Diffstat (limited to 'target-i386/helper.c')
-rw-r--r--target-i386/helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c
index e1820259be..8df109f7f6 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1157,7 +1157,7 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector,
     return 1;
 }
 
-CPUX86State *cpu_x86_init(const char *cpu_model)
+X86CPU *cpu_x86_init(const char *cpu_model)
 {
     X86CPU *cpu;
     CPUX86State *env;
@@ -1183,7 +1183,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model)
 
     x86_cpu_realize(OBJECT(cpu), NULL);
 
-    return env;
+    return cpu;
 }
 
 #if !defined(CONFIG_USER_ONLY)