From 7337c6eb98786372cdbfe7ebe7affbd166fdc7ca Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Thu, 16 Nov 2017 18:05:26 +0100 Subject: s390x/tcg: fix DIAG 308 with > 1 VCPU (MTTCG) Currently, multi threaded TCG with > 1 VCPU gets stuck during IPL, when the bios tries to switch to the loaded kernel via DIAG 308. As run_on_cpu() is used, we run into a deadlock after handling the reset. We need the iolock (just like KVM). Signed-off-by: David Hildenbrand Message-Id: <20171116170526.12643-4-david@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Cornelia Huck --- target/s390x/misc_helper.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'target/s390x') diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 4afd90b969..d272851e1c 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -103,7 +103,9 @@ void HELPER(diag)(CPUS390XState *env, uint32_t r1, uint32_t r3, uint32_t num) break; case 0x308: /* ipl */ + qemu_mutex_lock_iothread(); handle_diag_308(env, r1, r3); + qemu_mutex_unlock_iothread(); r = 0; break; case 0x288: -- cgit v1.2.3