[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/47] hw/mips: Use QEMU_IOTHREAD_LOCK_GUARD in cpu_mips_irq_reque
From: |
Richard Henderson |
Subject: |
[PULL 06/47] hw/mips: Use QEMU_IOTHREAD_LOCK_GUARD in cpu_mips_irq_request |
Date: |
Thu, 29 Dec 2022 16:01:40 -0800 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/mips/mips_int.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c
index 2db5e10fe0..73437cd90f 100644
--- a/hw/mips/mips_int.c
+++ b/hw/mips/mips_int.c
@@ -32,17 +32,12 @@ static void cpu_mips_irq_request(void *opaque, int irq, int
level)
MIPSCPU *cpu = opaque;
CPUMIPSState *env = &cpu->env;
CPUState *cs = CPU(cpu);
- bool locked = false;
if (irq < 0 || irq > 7) {
return;
}
- /* Make sure locking works even if BQL is already held by the caller */
- if (!qemu_mutex_iothread_locked()) {
- locked = true;
- qemu_mutex_lock_iothread();
- }
+ QEMU_IOTHREAD_LOCK_GUARD();
if (level) {
env->CP0_Cause |= 1 << (irq + CP0Ca_IP);
@@ -59,10 +54,6 @@ static void cpu_mips_irq_request(void *opaque, int irq, int
level)
} else {
cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
}
-
- if (locked) {
- qemu_mutex_unlock_iothread();
- }
}
void cpu_mips_irq_init_cpu(MIPSCPU *cpu)
--
2.34.1
- [PULL 00/47] tcg patch queue, Richard Henderson, 2022/12/29
- [PULL 02/47] meson: Move CONFIG_TCG_INTERPRETER to config_host, Richard Henderson, 2022/12/29
- [PULL 05/47] qemu/main-loop: Introduce QEMU_IOTHREAD_LOCK_GUARD, Richard Henderson, 2022/12/29
- [PULL 06/47] hw/mips: Use QEMU_IOTHREAD_LOCK_GUARD in cpu_mips_irq_request,
Richard Henderson <=
- [PULL 04/47] tcg: Cleanup trailing whitespace, Richard Henderson, 2022/12/29
- [PULL 09/47] target/riscv: Use QEMU_IOTHREAD_LOCK_GUARD in riscv_cpu_update_mip, Richard Henderson, 2022/12/29
- [PULL 03/47] tcg/s390x: Fix coding style, Richard Henderson, 2022/12/29
- [PULL 01/47] tcg: convert tcg/README to rst, Richard Henderson, 2022/12/29
- [PULL 07/47] target/ppc: Use QEMU_IOTHREAD_LOCK_GUARD in ppc_maybe_interrupt, Richard Henderson, 2022/12/29
- [PULL 15/47] tcg: Fix tcg_reg_alloc_dup*, Richard Henderson, 2022/12/29
- [PULL 08/47] target/ppc: Use QEMU_IOTHREAD_LOCK_GUARD in cpu_interrupt_exittb, Richard Henderson, 2022/12/29
- [PULL 11/47] accel/tcg: Use QEMU_IOTHREAD_LOCK_GUARD in io_readx/io_writex, Richard Henderson, 2022/12/29
- [PULL 12/47] tcg: Tidy tcg_reg_alloc_op, Richard Henderson, 2022/12/29
- [PULL 13/47] tcg: Remove TCG_TARGET_STACK_GROWSUP, Richard Henderson, 2022/12/29