Skip to content

Commit

Permalink
cpu: Change tcg_cpu_exec() arg to cpu, not env
Browse files Browse the repository at this point in the history
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: Andreas Färber <afaerber@suse.de>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
  • Loading branch information
pcrost authored and afaerber committed Jul 9, 2015
1 parent f7ec7f7 commit 3d57f78
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions cpus.c
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 3d57f78

Please sign in to comment.