Commit 3d57f789 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Andreas Färber
Browse files

cpu: Change tcg_cpu_exec() arg to cpu, not env 



The sole caller of this function navigates the cpu->env_ptr only for
this function to take it back the cpu pointer straight away. Pass in
cpu pointer instead and grab the env pointer locally in the function.
Removes a core code usage of ENV_GET_CPU().

Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent f7ec7f7b

cpus.c

+3 −4
Original line number Diff line number Diff line
@@ -1357,9 +1357,9 @@ int vm_stop_force_state(RunState state) 
    }

}



static int tcg_cpu_exec(CPUArchState *env)

static int tcg_cpu_exec(CPUState *cpu)

{

    CPUState *cpu = ENV_GET_CPU(env);

    CPUArchState *env = cpu->env_ptr;

    int ret;

#ifdef CONFIG_PROFILER

    int64_t ti;
@@ -1421,13 +1421,12 @@ static void tcg_exec_all(void) 
    }

    for (; next_cpu != NULL && !exit_request; next_cpu = CPU_NEXT(next_cpu)) {

        CPUState *cpu = next_cpu;

        CPUArchState *env = cpu->env_ptr;



        qemu_clock_enable(QEMU_CLOCK_VIRTUAL,

                          (cpu->singlestep_enabled & SSTEP_NOTIMER) == 0);



        if (cpu_can_run(cpu)) {

            r = tcg_cpu_exec(env);

            r = tcg_cpu_exec(cpu);

            if (r == EXCP_DEBUG) {

                cpu_handle_guest_debug(cpu);

                break;