Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/ke…

…rnel/git/paulus/powerpc into kvm-master
git-mirror · Dec 11, 2015 · e307bec · e307bec
2 parents 8b89fe1 + c20875a
commit e307bec
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
@@ -224,6 +224,12 @@ static void kvmppc_core_vcpu_put_hv(struct kvm_vcpu *vcpu)
 
 static void kvmppc_set_msr_hv(struct kvm_vcpu *vcpu, u64 msr)
 {
+	/*
+	 * Check for illegal transactional state bit combination
+	 * and if we find it, force the TS field to a safe state.
+	 */
+	if ((msr & MSR_TS_MASK) == MSR_TS_MASK)
+		msr &= ~MSR_TS_MASK;
 	vcpu->arch.shregs.msr = msr;
 	kvmppc_end_cede(vcpu);
 }