Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e307beca authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-ppc-fixes' of... 

Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master
parents 8b89fe1f c20875a3

arch/powerpc/kvm/book3s_hv.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

}