Message ID | 1336608892-30501-2-git-send-email-afaerber@suse.de |
---|---|
State | New |
Headers | show |
On 10 May 2012 01:13, Andreas Färber <afaerber@suse.de> wrote: > Commit 3c30dd5a68e9fee6af67cfd0d14ed7520820f36a (target-arm: Move reset > handling to arm_cpu_reset) QOM'ified CPU reset. Complete it by replacing > cpu_state_reset() with cpu_reset(). > > Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org> -- PMM
Am 11.05.2012 13:24, schrieb Peter Maydell: > On 10 May 2012 01:13, Andreas Färber <afaerber@suse.de> wrote: >> Commit 3c30dd5a68e9fee6af67cfd0d14ed7520820f36a (target-arm: Move reset >> handling to arm_cpu_reset) QOM'ified CPU reset. Complete it by replacing >> cpu_state_reset() with cpu_reset(). >> >> Signed-off-by: Andreas Färber <afaerber@suse.de> > > Acked-by: Peter Maydell <peter.maydell@linaro.org> Thanks, applied to qom-next: http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/qom-next /-F
diff --git a/target-arm/helper.c b/target-arm/helper.c index 7e1c2c0..06ebffc 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -80,7 +80,7 @@ ARMCPU *cpu_arm_init(const char *cpu_model) arm_translate_init(); } - cpu_state_reset(env); + cpu_reset(CPU(cpu)); if (arm_feature(env, ARM_FEATURE_NEON)) { gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg, 51, "arm-neon.xml", 0);
Commit 3c30dd5a68e9fee6af67cfd0d14ed7520820f36a (target-arm: Move reset handling to arm_cpu_reset) QOM'ified CPU reset. Complete it by replacing cpu_state_reset() with cpu_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> --- target-arm/helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)