From: David Hildenbrand <d...@linux.vnet.ibm.com> If a cpu is stopped, it must never be allowed to run and no interrupt may wake it up. A cpu also has to be unhalted if it is halted and has work to do - this scenario wasn't hit in kvm case yet, as only "disabled wait" is processed within QEMU.
Signed-off-by: David Hildenbrand <d...@linux.vnet.ibm.com> Reviewed-by: Cornelia Huck <cornelia.h...@de.ibm.com> Reviewed-by: Christian Borntraeger <borntrae...@de.ibm.com> Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com> --- target-s390x/cpu.c | 6 ++++++ target-s390x/kvm.c | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index c5ab98f..1d32f5a 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -72,6 +72,12 @@ static bool s390_cpu_has_work(CPUState *cs) S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = &cpu->env; + /* stopped cpus can never run */ + if (env->cpu_state == CPU_STATE_STOPPED || + env->cpu_state == CPU_STATE_CHECK_STOP) { + return false; + } + return (cs->interrupt_request & CPU_INTERRUPT_HARD) && (env->psw.mask & PSW_MASK_EXT); } diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index db2e42c..00125f1 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -553,6 +553,11 @@ void kvm_arch_post_run(CPUState *cpu, struct kvm_run *run) int kvm_arch_process_async_events(CPUState *cs) { + if (cs->halted && CPU_GET_CLASS(cs)->has_work(cs)) { + /* has_work will take care of stopped cpus */ + s390_cpu_unhalt(S390_CPU(cs)); + } + return cs->halted; } -- 1.8.4.2 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html