[v6,65/73] s390x: convert to cpu_has_work_with_iothread_lock

Commit Message

Emilio Cota Jan. 30, 2019, 12:48 a.m. UTC

Soon we will call cpu_has_work without the BQL.

Cc: Cornelia Huck <[e-mail]>
Cc: David Hildenbrand <[e-mail]>
Cc: [e-mail]
Reviewed-by: Richard Henderson <[e-mail]>
Signed-off-by: Emilio G. Cota <[e-mail]>
---
 target/s390x/cpu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Cornelia Huck Jan. 30, 2019, 10:35 a.m. UTC | #1

On Tue, 29 Jan 2019 19:48:03 -0500
"Emilio G. Cota" <[e-mail]> wrote:

> Soon we will call cpu_has_work without the BQL.
> 
> Cc: Cornelia Huck <[e-mail]>
> Cc: David Hildenbrand <[e-mail]>
> Cc: [e-mail]
> Reviewed-by: Richard Henderson <[e-mail]>
> Signed-off-by: Emilio G. Cota <[e-mail]>
> ---
>  target/s390x/cpu.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Cornelia Huck <[e-mail]>

Patch

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index d1594c90d9..5c38abaa49 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -59,6 +59,8 @@  static bool s390_cpu_has_work(CPUState *cs)
 {
     S390CPU *cpu = S390_CPU(cs);
 
+    g_assert(qemu_mutex_iothread_locked());
+
     /* STOPPED cpus can never wake up */
     if (s390_cpu_get_state(cpu) != S390_CPU_STATE_LOAD &&
         s390_cpu_get_state(cpu) != S390_CPU_STATE_OPERATING) {
@@ -473,7 +475,7 @@  static void s390_cpu_class_init(ObjectClass *oc, void *data)
     scc->initial_cpu_reset = s390_cpu_initial_reset;
     cc->reset = s390_cpu_full_reset;
     cc->class_by_name = s390_cpu_class_by_name,
-    cc->has_work = s390_cpu_has_work;
+    cc->has_work_with_iothread_lock = s390_cpu_has_work;
 #ifdef CONFIG_TCG
     cc->do_interrupt = s390_cpu_do_interrupt;
 #endif