diff options
| author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2015-02-24 14:15:30 +0100 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-03-10 09:26:23 +0100 |
| commit | e3b7b57807b5820e21555b711726e6abb1a4050f (patch) | |
| tree | caa27192a1a6b12374579c7e7b2ba35fb851962b | |
| parent | 3f10341ffbbf4271485c32ca96a75d99d1b6bf6d (diff) | |
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 <thuth@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <1424783731-43426-10-git-send-email-jfrei@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
| -rw-r--r-- | target-s390x/kvm.c | 13 |
1 files changed, 11 insertions, 2 deletions
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; } |