diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-11-17 19:00:22 -0800 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-01-04 16:20:01 -0800 |
| commit | 6fa8c46e55f1ef141b188563e914c46957ce163c (patch) | |
| tree | 36942a084f96d9b064c75c228a87cdc00ccc7486 /hw/mips | |
| parent | 0aa5d47ac58d914cd1e0dbd69d5a21c89d1b8079 (diff) | |
| download | focaccia-qemu-6fa8c46e55f1ef141b188563e914c46957ce163c.tar.gz focaccia-qemu-6fa8c46e55f1ef141b188563e914c46957ce163c.zip | |
hw/mips: Use QEMU_IOTHREAD_LOCK_GUARD in cpu_mips_irq_request
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/mips')
| -rw-r--r-- | hw/mips/mips_int.c | 11 |
1 files changed, 1 insertions, 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) |