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>
This commit is contained in:
parent
0aa5d47ac5
commit
6fa8c46e55
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user