commit 03c02807e25ef0f44767f28e939efc2c5deb0f3d
author Heiko Carstens <heiko.carstens@de.ibm.com> Fri Nov 13 13:31:58 2015 +0100
committer Christian Borntraeger <borntraeger@de.ibm.com> Thu Nov 19 11:08:17 2015 +0100
tree 25eee059dedb4fd00a7f58bb7eab173f5b705315
parent 5967c17b118a2bd1dd1d554cc4eee16233e52bec

KVM: s390: fix pfmf intercept handler

The pfmf intercept handler should check if the EDAT 1 facility
is installed in the guest, not if it is installed in the host.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

arch/s390/kvm/priv.c

diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 77191b8..d76b51c 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -660,7 +660,7 @@
 
 	kvm_s390_get_regs_rre(vcpu, &reg1, &reg2);
 
-	if (!MACHINE_HAS_PFMF)
+	if (!test_kvm_facility(vcpu->kvm, 8))
 		return kvm_s390_inject_program_int(vcpu, PGM_OPERATION);
 
 	if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)