From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 18 Nov 2022 03:07:11 +0000 (-0800)
Subject: target/ppc: Use QEMU_IOTHREAD_LOCK_GUARD in ppc_maybe_interrupt
X-Git-Tag: v8.0.0-rc0~106^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fc4f9f3ff2362d4436476087fb13ad26fd2814a;p=thirdparty%2Fqemu.git

target/ppc: Use QEMU_IOTHREAD_LOCK_GUARD in ppc_maybe_interrupt

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index add4d54ae76..287659c74db 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -2163,22 +2163,13 @@ static int ppc_next_unmasked_interrupt(CPUPPCState *env)
 void ppc_maybe_interrupt(CPUPPCState *env)
 {
     CPUState *cs = env_cpu(env);
-    bool locked = false;
-
-    if (!qemu_mutex_iothread_locked()) {
-        locked = true;
-        qemu_mutex_lock_iothread();
-    }
+    QEMU_IOTHREAD_LOCK_GUARD();
 
     if (ppc_next_unmasked_interrupt(env)) {
         cpu_interrupt(cs, CPU_INTERRUPT_HARD);
     } else {
         cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
     }
-
-    if (locked) {
-        qemu_mutex_unlock_iothread();
-    }
 }
 
 #if defined(TARGET_PPC64)