From: "Emilio G. Cota" <c...@braap.org>
Soon we will call cpu_has_work without the BQL.
Cc: Aurelien Jarno <aurel...@aurel32.net>
Cc: Aleksandar Markovic <aleksandar.qemu.de...@gmail.com>
Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
Signed-off-by: Emilio G. Cota <c...@braap.org>
Signed-off-by: Robert Foley <robert.fo...@linaro.org>
---
target/mips/cpu.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 761d8aaa54..ec9dde5100 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -58,6 +58,8 @@ static bool mips_cpu_has_work(CPUState *cs)
bool has_work = false;
uint32_t interrupt_request = cpu_interrupt_request(cs);
+ g_assert(qemu_mutex_iothread_locked());
+
/*
* Prior to MIPS Release 6 it is implementation dependent if non-enabled
* interrupts wake-up the CPU, however most of the implementations only
@@ -193,7 +195,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *data)
device_class_set_parent_reset(dc, mips_cpu_reset, &mcc->parent_reset);
cc->class_by_name = mips_cpu_class_by_name;
- cc->has_work = mips_cpu_has_work;
+ cc->has_work_with_iothread_lock = mips_cpu_has_work;
cc->do_interrupt = mips_cpu_do_interrupt;
cc->cpu_exec_interrupt = mips_cpu_exec_interrupt;
cc->dump_state = mips_cpu_dump_state;
--
2.17.1
