提交 fee0e0fd 编写于 作者: D David Hildenbrand 提交者: Christian Borntraeger

KVM: s390: disabled wait cares about machine checks, not PER

We don't care about program event recording irqs (synchronous
program irqs) but asynchronous irqs when checking for disabled
wait. Machine checks were missing.

Let's directly switch to the functions we have for that purpose
instead of testing once again for magic bits.
Reviewed-by: NChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: NDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
上级 f59922b4
...@@ -51,11 +51,9 @@ static int psw_mchk_disabled(struct kvm_vcpu *vcpu) ...@@ -51,11 +51,9 @@ static int psw_mchk_disabled(struct kvm_vcpu *vcpu)
static int psw_interrupts_disabled(struct kvm_vcpu *vcpu) static int psw_interrupts_disabled(struct kvm_vcpu *vcpu)
{ {
if ((vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PER) || return psw_extint_disabled(vcpu) &&
(vcpu->arch.sie_block->gpsw.mask & PSW_MASK_IO) || psw_ioint_disabled(vcpu) &&
(vcpu->arch.sie_block->gpsw.mask & PSW_MASK_EXT)) psw_mchk_disabled(vcpu);
return 0;
return 1;
} }
static int ckc_interrupts_enabled(struct kvm_vcpu *vcpu) static int ckc_interrupts_enabled(struct kvm_vcpu *vcpu)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册