Re: [Qemu-devel] [RFC v4 26/71] xtensa: convert to cpu_halted

[Alex Bennée]

Emilio G. Cota <address@hidden> writes:

> Cc: Max Filippov <address@hidden>
> Reviewed-by: Richard Henderson <address@hidden>
> Signed-off-by: Emilio G. Cota <address@hidden>

Reviewed-by: Alex Bennée <address@hidden>

> ---
>  target/xtensa/cpu.c       | 2 +-
>  target/xtensa/helper.c    | 2 +-
>  target/xtensa/op_helper.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
> index a54dbe4260..d4ca35e6cc 100644
> --- a/target/xtensa/cpu.c
> +++ b/target/xtensa/cpu.c
> @@ -86,7 +86,7 @@ static void xtensa_cpu_reset(CPUState *s)
>
>  #ifndef CONFIG_USER_ONLY
>      reset_mmu(env);
> -    s->halted = env->runstall;
> +    cpu_halted_set(s, env->runstall);
>  #endif
>  }
>
> diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c
> index 501082f55b..dd6819fbad 100644
> --- a/target/xtensa/helper.c
> +++ b/target/xtensa/helper.c
> @@ -807,7 +807,7 @@ void xtensa_runstall(CPUXtensaState *env, bool runstall)
>      CPUState *cpu = CPU(xtensa_env_get_cpu(env));
>
>      env->runstall = runstall;
> -    cpu->halted = runstall;
> +    cpu_halted_set(cpu, runstall);
>      if (runstall) {
>          cpu_interrupt(cpu, CPU_INTERRUPT_HALT);
>      } else {
> diff --git a/target/xtensa/op_helper.c b/target/xtensa/op_helper.c
> index e4b42ab3e5..510040b593 100644
> --- a/target/xtensa/op_helper.c
> +++ b/target/xtensa/op_helper.c
> @@ -414,7 +414,7 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, 
> uint32_t intlevel)
>      }
>
>      cpu = CPU(xtensa_env_get_cpu(env));
> -    cpu->halted = 1;
> +    cpu_halted_set(cpu, 1);
>      HELPER(exception)(env, EXCP_HLT);
>  }


--
Alex Bennée