From: David Hildenbrand Date: Tue, 24 Feb 2015 13:15:30 +0000 (+0100) Subject: s390x/kvm: deliver SIGP RESTART directly if stopped X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e3b7b57807b5820e21555b711726e6abb1a4050f;p=qemu.git s390x/kvm: deliver SIGP RESTART directly if stopped 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 Reviewed-by: Cornelia Huck Signed-off-by: Jens Freimann Signed-off-by: David Hildenbrand Message-Id: <1424783731-43426-10-git-send-email-jfrei@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger --- diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 702351331f..ec64b7e506 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -1254,8 +1254,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; }