diff options
| author | Peter Crosthwaite <crosthwaitepeter@gmail.com> | 2015-06-23 19:31:18 -0700 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-07-09 15:20:40 +0200 |
| commit | 4bad9e392e788a218967167a38ce2ae7a32a6231 (patch) | |
| tree | 3ba279650a6cb4c999ece4150e0890fba8f526e7 /exec.c | |
| parent | 3d57f7893c90d911d786cb2c622b0926fc808b57 (diff) | |
cpu: Change cpu_exec_init() arg to cpu, not env
The callers (most of them in target-foo/cpu.c) to this function all
have the cpu pointer handy. Just pass it to avoid an ENV_GET_CPU() from
core code (in exec.c).
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Michael Walle <michael@walle.cc>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Cc: Anthony Green <green@moxielogic.com>
Cc: Jia Liu <proljc@gmail.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -571,9 +571,8 @@ void cpu_exec_exit(CPUState *cpu) } #endif -void cpu_exec_init(CPUArchState *env, Error **errp) +void cpu_exec_init(CPUState *cpu, Error **errp) { - CPUState *cpu = ENV_GET_CPU(env); CPUClass *cc = CPU_GET_CLASS(cpu); int cpu_index; Error *local_err = NULL; @@ -604,7 +603,7 @@ void cpu_exec_init(CPUArchState *env, Error **errp) } #if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY) register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION, - cpu_save, cpu_load, env); + cpu_save, cpu_load, cpu->env_ptr); assert(cc->vmsd == NULL); assert(qdev_get_vmsd(DEVICE(cpu)) == NULL); #endif |