From: David Hildenbrand <d...@linux.vnet.ibm.com>
According to the PoP, a restart irq has to be delivered "without first honoring
any other pending interruptions", if a cpu is in the STOPPED state.
While it is hard to implement this case in kvm, it can easily be handled in
qemu.
Reviewed-by: Thomas Huth <th...@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.h...@de.ibm.com>
Signed-off-by: Jens Freimann <jf...@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <d...@linux.vnet.ibm.com>
---
target-s390x/kvm.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index ed56b3c..7f9fd02 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -1241,8 +1241,17 @@ static void sigp_restart(void *arg)
.type = KVM_S390_RESTART,
};
- kvm_s390_vcpu_interrupt(si->cpu, &irq);
- s390_cpu_set_state(CPU_STATE_OPERATING, si->cpu);
+ switch (s390_cpu_get_state(si->cpu)) {
+ case CPU_STATE_STOPPED:
+ /* the restart irq has to be delivered prior to any other pending irq
*/
+ cpu_synchronize_state(CPU(si->cpu));
+ do_restart_interrupt(&si->cpu->env);
+ s390_cpu_set_state(CPU_STATE_OPERATING, si->cpu);
+ break;
+ case CPU_STATE_OPERATING:
+ kvm_s390_vcpu_interrupt(si->cpu, &irq);
+ break;
+ }
si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
}
--
2.1.4
