Message ID | 20171020115418.2050-12-cohuck@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index 63058a6b7a..56331ae4fb 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -468,6 +468,12 @@ void s390_cpu_do_interrupt(CPUState *cs) do_mchk_interrupt(env); break; } + + /* WAIT PSW during interrupt injection */ + if (cs->exception_index == EXCP_HLT) { + /* don't trigger a cpu_loop_exit(), use an interrupt instead */ + cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HALT); + } cs->exception_index = -1; /* we might still have pending interrupts, but not deliverable */