diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-04-20 07:39:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2012-04-27 11:04:44 +0000 |
| commit | 778c3a0619f3b47f94e566ca4f656aabe5f4b3d6 (patch) | |
| tree | 62657bfb866880be18316425819a730e8228ad90 /target-arm/helper.c | |
| parent | be5ea8ed4481f0ffa4ea0f7ba13e465701536001 (diff) | |
| download | qemu-778c3a0619f3b47f94e566ca4f656aabe5f4b3d6.zip qemu-778c3a0619f3b47f94e566ca4f656aabe5f4b3d6.tar.gz qemu-778c3a0619f3b47f94e566ca4f656aabe5f4b3d6.tar.bz2 | |
target-arm: Change cpu_arm_init() return type to ARMCPU
Make cpu_arm_init() return a QOM ARMCPU, so that we don't need to
obtain an ARMCPU through arm_env_get_cpu() in machine init code.
This requires to adjust the inclusion site of cpu-qom.h and in turn,
forward-looking, to homogenize its include order.
cpu_init() must still return a CPUARMState for backwards and
cross-target compatibility, so adjust the cpu_init macro.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-arm/helper.c')
| -rw-r--r-- | target-arm/helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c index 101031d..7e1c2c0 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -61,7 +61,7 @@ static int vfp_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg) return 0; } -CPUARMState *cpu_arm_init(const char *cpu_model) +ARMCPU *cpu_arm_init(const char *cpu_model) { ARMCPU *cpu; CPUARMState *env; @@ -92,7 +92,7 @@ CPUARMState *cpu_arm_init(const char *cpu_model) 19, "arm-vfp.xml", 0); } qemu_init_vcpu(env); - return env; + return cpu; } typedef struct ARMCPUListState { |