On 2019-06-28 15:08, Claudio Carvalho wrote:
From: Michael Anderson <[email protected]>

- Check for MSR_S so that kvmppc_set_msr will include it. Prior to this
   change return to guest would not have the S bit set.

 - Patch based on comment from Paul Mackerras <[email protected]>

Signed-off-by: Michael Anderson <[email protected]>
Signed-off-by: Claudio Carvalho <[email protected]>
Acked-by: Paul Mackerras <[email protected]>
 Reviewed-by: Janani Janakiraman <[email protected]>
---
 arch/powerpc/kvm/book3s_64_mmu_hv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c
b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index ab3d484c5e2e..ab62a66f9b4e 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -295,6 +295,7 @@ static void
kvmppc_mmu_book3s_64_hv_reset_msr(struct kvm_vcpu *vcpu)
                msr |= MSR_TS_S;
        else
                msr |= vcpu->arch.shregs.msr & MSR_TS_MASK;
+       msr |= vcpu->arch.shregs.msr & MSR_S;
        kvmppc_set_msr(vcpu, msr);
 }

Reply via email to