diff options
author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2014-08-05 11:40:47 -0400 |
---|---|---|
committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-01-23 07:25:34 -0500 |
commit | 9a022067ad75b117f1c1e5cbf6a592022cf0a749 (patch) | |
tree | f73884c87fe971a52c6f6966a20d8be695f13486 /arch/s390/kvm/kvm-s390.h | |
parent | 6cddd432e3da5e25eccbc13844d03c871674a62e (diff) |
KVM: s390: a VCPU may only stop when no interrupts are left pending
As a SIGP STOP is an interrupt with the least priority, it may only result
in stop of the vcpu when no other interrupts are left pending.
To detect whether a non-stop irq is pending, we need a way to mask out
stop irqs from the general kvm_cpu_has_interrupt() function. For this
reason, the existing function (with an outdated name) is replaced by
kvm_s390_vcpu_has_irq() which allows to mask out pending stop irqs.
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390/kvm/kvm-s390.h')
-rw-r--r-- | arch/s390/kvm/kvm-s390.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h index d72ff624920e..2becffef6b61 100644 --- a/arch/s390/kvm/kvm-s390.h +++ b/arch/s390/kvm/kvm-s390.h | |||
@@ -228,7 +228,7 @@ int s390int_to_s390irq(struct kvm_s390_interrupt *s390int, | |||
228 | struct kvm_s390_irq *s390irq); | 228 | struct kvm_s390_irq *s390irq); |
229 | 229 | ||
230 | /* implemented in interrupt.c */ | 230 | /* implemented in interrupt.c */ |
231 | int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu); | 231 | int kvm_s390_vcpu_has_irq(struct kvm_vcpu *vcpu, int exclude_stop); |
232 | int psw_extint_disabled(struct kvm_vcpu *vcpu); | 232 | int psw_extint_disabled(struct kvm_vcpu *vcpu); |
233 | void kvm_s390_destroy_adapters(struct kvm *kvm); | 233 | void kvm_s390_destroy_adapters(struct kvm *kvm); |
234 | int kvm_s390_si_ext_call_pending(struct kvm_vcpu *vcpu); | 234 | int kvm_s390_si_ext_call_pending(struct kvm_vcpu *vcpu); |