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/cpu.c | |
| parent | be5ea8ed4481f0ffa4ea0f7ba13e465701536001 (diff) | |
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/cpu.c')
| -rw-r--r-- | target-arm/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/cpu.c b/target-arm/cpu.c index cc67d4d9f4..2e0eccd03a 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -18,7 +18,7 @@ * <http://www.gnu.org/licenses/gpl-2.0.html> */ -#include "cpu-qom.h" +#include "cpu.h" #include "qemu-common.h" #if !defined(CONFIG_USER_ONLY) #include "hw/loader.h" |