KVM: PPC: Book3S HV: Ensure MSR[HV] is always clear in guest MSR

[sfrench/cifs-2.6.git] / arch / powerpc / kvm / book3s_hv_builtin.c

diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c
index 41cb03d0bde451c491c2b4280518f9875be41d2b..7a0e33a9c980df7f9af49a558df216ab89d7f385 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_builtin.c
+++ b/arch/powerpc/kvm/book3s_hv_builtin.c
@@ -662,8 +662,8 @@ static void kvmppc_end_cede(struct kvm_vcpu *vcpu)
 
 void kvmppc_set_msr_hv(struct kvm_vcpu *vcpu, u64 msr)
 {
-       /* Guest must always run with ME enabled. */
-       msr = msr | MSR_ME;
+       /* Guest must always run with ME enabled, HV disabled. */
+       msr = (msr | MSR_ME) & ~MSR_HV;
 
        /*
         * Check for illegal transactional state bit combination