summaryrefslogtreecommitdiff
path: root/target-s390x/helper.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-03 04:13:04 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-11 00:23:04 +0200
commit564b863d8e4015d763acc6e4f010b031594fa7e5 (patch)
treefc5935c732b831fd6c423cc38a8b2c5037d6dd8f /target-s390x/helper.c
parenta0595d9eb85c64e00d03c4d696bb1028e99dfcbc (diff)
downloadqemu-564b863d8e4015d763acc6e4f010b031594fa7e5.tar.gz
target-s390x: Let cpu_s390x_init() return S390CPU
Let cpu_init() return CPUS390XState for backwards compatibility. Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-s390x/helper.c')
-rw-r--r--target-s390x/helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index a34a35b536..d0a1180a83 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -70,7 +70,7 @@ void s390x_cpu_timer(void *opaque)
}
#endif
-CPUS390XState *cpu_s390x_init(const char *cpu_model)
+S390CPU *cpu_s390x_init(const char *cpu_model)
{
S390CPU *cpu;
CPUS390XState *env;
@@ -86,7 +86,7 @@ CPUS390XState *cpu_s390x_init(const char *cpu_model)
env->cpu_model_str = cpu_model;
qemu_init_vcpu(env);
- return env;
+ return cpu;
}
#if defined(CONFIG_USER_ONLY)