Re: [Qemu-devel] [RFC v4 61/71] mips: convert to cpu_has_work_with_iothread_lock

2018-10-26 Thread Richard Henderson
On 10/25/18 3:46 PM, Emilio G. Cota wrote:
> Soon we will call cpu_has_work without the BQL.
> 
> Cc: Aurelien Jarno 
> Cc: Aleksandar Markovic 
> Signed-off-by: Emilio G. Cota 
> ---
>  target/mips/cpu.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Richard Henderson 

r~





[Qemu-devel] [RFC v4 61/71] mips: convert to cpu_has_work_with_iothread_lock

2018-10-25 Thread Emilio G. Cota
Soon we will call cpu_has_work without the BQL.

Cc: Aurelien Jarno 
Cc: Aleksandar Markovic 
Signed-off-by: Emilio G. Cota 
---
 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 992d64e796..dcda1bce31 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
check for interrupts that can be taken. */
@@ -181,7 +183,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *data)
 cc->reset = mips_cpu_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