Re: [Qemu-devel] [RFC v4 50/71] s390x: convert to cpu_interrupt_request

[Alex Bennée]

Emilio G. Cota <address@hidden> writes:

> Cc: Cornelia Huck <address@hidden>
> Cc: Christian Borntraeger <address@hidden>
> Cc: Alexander Graf <address@hidden>
> Cc: David Hildenbrand <address@hidden>
> Cc: address@hidden
> Reviewed-by: Richard Henderson <address@hidden>
> Signed-off-by: Emilio G. Cota <address@hidden>

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


> ---
>  hw/intc/s390_flic.c | 2 +-
>  target/s390x/cpu.c  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
> index bfb5cf1d07..d944824e67 100644
> --- a/hw/intc/s390_flic.c
> +++ b/hw/intc/s390_flic.c
> @@ -189,7 +189,7 @@ static void qemu_s390_flic_notify(uint32_t type)
>      CPU_FOREACH(cs) {
>          S390CPU *cpu = S390_CPU(cs);
>
> -        cs->interrupt_request |= CPU_INTERRUPT_HARD;
> +        cpu_interrupt_request_or(cs, CPU_INTERRUPT_HARD);
>
>          /* ignore CPUs that are not sleeping */
>          if (s390_cpu_get_state(cpu) != S390_CPU_STATE_OPERATING &&
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index 956d4e1d18..1f91df57bc 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -65,7 +65,7 @@ static bool s390_cpu_has_work(CPUState *cs)
>          return false;
>      }
>
> -    if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) {
> +    if (!(cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD)) {
>          return false;
>      }


--
Alex Bennée