Re: [Qemu-devel] [PATCH v6 60/73] cpu: convert to interrupt_request

[Alex Bennée]

Emilio G. Cota <address@hidden> writes:

> This finishes the conversion to interrupt_request.
>
> Signed-off-by: Emilio G. Cota <address@hidden>

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

> ---
>  qom/cpu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/qom/cpu.c b/qom/cpu.c
> index 00add81a7f..f2695be9b2 100644
> --- a/qom/cpu.c
> +++ b/qom/cpu.c
> @@ -275,7 +275,7 @@ static void cpu_common_reset(CPUState *cpu)
>          log_cpu_state(cpu, cc->reset_dump_flags);
>      }
>
> -    cpu->interrupt_request = 0;
> +    cpu_interrupt_request_set(cpu, 0);
>      cpu_halted_set(cpu, 0);
>      cpu->mem_io_pc = 0;
>      cpu->mem_io_vaddr = 0;
> @@ -412,7 +412,7 @@ static vaddr cpu_adjust_watchpoint_address(CPUState *cpu, 
> vaddr addr, int len)
>
>  static void generic_handle_interrupt(CPUState *cpu, int mask)
>  {
> -    cpu->interrupt_request |= mask;
> +    cpu_interrupt_request_or(cpu, mask);
>
>      if (!qemu_cpu_is_self(cpu)) {
>          qemu_cpu_kick(cpu);


--
Alex Bennée