Commit 4bad9e39 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Andreas Färber
Browse files

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: default avatarAndreas Färber <afaerber@suse.de>
Reviewed-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 3d57f789

exec.c

+2 −3
Original line number Diff line number Diff line
@@ -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

include/exec/exec-all.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr); 
TranslationBlock *tb_gen_code(CPUState *cpu,

                              target_ulong pc, target_ulong cs_base, int flags,

                              int cflags);

void cpu_exec_init(CPUArchState *env, Error **errp);

void cpu_exec_init(CPUState *cpu, Error **errp);

void QEMU_NORETURN cpu_loop_exit(CPUState *cpu);



#if !defined(CONFIG_USER_ONLY)

target-alpha/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static void alpha_cpu_initfn(Object *obj) 
    CPUAlphaState *env = &cpu->env;



    cs->env_ptr = env;

    cpu_exec_init(env, &error_abort);

    cpu_exec_init(cs, &error_abort);

    tlb_flush(cs, 1);



    alpha_translate_init();

target-arm/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static void arm_cpu_initfn(Object *obj) 
    uint32_t Aff1, Aff0;



    cs->env_ptr = &cpu->env;

    cpu_exec_init(&cpu->env, &error_abort);

    cpu_exec_init(cs, &error_abort);

    cpu->cp_regs = g_hash_table_new_full(g_int_hash, g_int_equal,

                                         g_free, g_free);

target-cris/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static void cris_cpu_initfn(Object *obj) 
    static bool tcg_initialized;



    cs->env_ptr = env;

    cpu_exec_init(env, &error_abort);

    cpu_exec_init(cs, &error_abort);



    env->pregs[PR_VR] = ccc->vr;