Emilio G. Cota <c...@braap.org> writes:
> Cc: Stafford Horne <sho...@gmail.com>
> Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
> Signed-off-by: Emilio G. Cota <c...@braap.org>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
> ---
> hw/openrisc/cputimer.c | 2 +-
> target/openrisc/cpu.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/openrisc/cputimer.c b/hw/openrisc/cputimer.c
> index 850f88761c..739404e4f5 100644
> --- a/hw/openrisc/cputimer.c
> +++ b/hw/openrisc/cputimer.c
> @@ -102,7 +102,7 @@ static void openrisc_timer_cb(void *opaque)
> CPUState *cs = CPU(cpu);
>
> cpu->env.ttmr |= TTMR_IP;
> - cs->interrupt_request |= CPU_INTERRUPT_TIMER;
> + cpu_interrupt_request_or(cs, CPU_INTERRUPT_TIMER);
> }
>
> switch (cpu->env.ttmr & TTMR_M) {
> diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c
> index fb7cb5c507..cdbc9353b7 100644
> --- a/target/openrisc/cpu.c
> +++ b/target/openrisc/cpu.c
> @@ -32,8 +32,8 @@ static void openrisc_cpu_set_pc(CPUState *cs, vaddr value)
>
> static bool openrisc_cpu_has_work(CPUState *cs)
> {
> - return cs->interrupt_request & (CPU_INTERRUPT_HARD |
> - CPU_INTERRUPT_TIMER);
> + return cpu_interrupt_request(cs) & (CPU_INTERRUPT_HARD |
> + CPU_INTERRUPT_TIMER);
> }
>
> static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info)
--
Alex Bennée
