[RFC,v4,34/71] s390x: use cpu_reset_interrupt

Commit Message

Emilio Cota Oct. 25, 2018, 2:46 p.m. UTC

From: Paolo Bonzini <[e-mail]>

Cc: Cornelia Huck <[e-mail]>
Cc: Alexander Graf <[e-mail]>
Cc: David Hildenbrand <[e-mail]>
Cc: [e-mail]
Reviewed-by: David Hildenbrand <[e-mail]>
Reviewed-by: Richard Henderson <[e-mail]>
Reviewed-by: Cornelia Huck <[e-mail]>
Signed-off-by: Paolo Bonzini <[e-mail]>
Signed-off-by: Emilio G. Cota <[e-mail]>
---
 target/s390x/excp_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alex Bennée Oct. 31, 2018, 4:34 p.m. UTC | #1

Emilio G. Cota <[e-mail]> writes:

> From: Paolo Bonzini <[e-mail]>
>
> Cc: Cornelia Huck <[e-mail]>
> Cc: Alexander Graf <[e-mail]>
> Cc: David Hildenbrand <[e-mail]>
> Cc: [e-mail]
> Reviewed-by: David Hildenbrand <[e-mail]>
> Reviewed-by: Richard Henderson <[e-mail]>
> Reviewed-by: Cornelia Huck <[e-mail]>
> Signed-off-by: Paolo Bonzini <[e-mail]>
> Signed-off-by: Emilio G. Cota <[e-mail]>

Reviewed-by: Alex Bennée <[e-mail]>

> ---
>  target/s390x/excp_helper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
> index d22c5b3ce5..7ca50b3df6 100644
> --- a/target/s390x/excp_helper.c
> +++ b/target/s390x/excp_helper.c
> @@ -454,7 +454,7 @@ try_deliver:
>
>      /* we might still have pending interrupts, but not deliverable */
>      if (!env->pending_int && !qemu_s390_flic_has_any(flic)) {
> -        cs->interrupt_request &= ~CPU_INTERRUPT_HARD;
> +        cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
>      }
>
>      /* WAIT PSW during interrupt injection or STOP interrupt */


--
Alex Bennée

Patch

diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
index d22c5b3ce5..7ca50b3df6 100644
--- a/target/s390x/excp_helper.c
+++ b/target/s390x/excp_helper.c
@@ -454,7 +454,7 @@  try_deliver:
 
     /* we might still have pending interrupts, but not deliverable */
     if (!env->pending_int && !qemu_s390_flic_has_any(flic)) {
-        cs->interrupt_request &= ~CPU_INTERRUPT_HARD;
+        cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
     }
 
     /* WAIT PSW during interrupt injection or STOP interrupt */