diff options
| author | Zachary Amsden <zamsden@redhat.com> | 2010-05-26 15:09:43 -1000 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-08-01 10:39:22 +0300 |
| commit | 6dc696d4ddf2181eefee361e1d24a49351aef1f6 (patch) | |
| tree | 03836aecacdb1fb054cffdf51534368521cd566d | |
| parent | 01c168ac3d6568fed0373d82bd2db2b9339aab16 (diff) | |
| download | linux-3.10-6dc696d4ddf2181eefee361e1d24a49351aef1f6.tar.gz linux-3.10-6dc696d4ddf2181eefee361e1d24a49351aef1f6.tar.bz2 linux-3.10-6dc696d4ddf2181eefee361e1d24a49351aef1f6.zip | |
KVM: SVM: Fix EFER.LME being stripped
Must set VCPU register to be the guest notion of EFER even if that
setting is not valid on hardware. This was masked by the set in
set_efer until 7657fd5ace88e8092f5f3a84117e093d7b893f26 broke that.
Fix is simply to set the VCPU register before stripping bits.
Signed-off-by: Zachary Amsden <zamsden@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch/x86/kvm/svm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 02ea5cf4b1e..9c68a650f57 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -286,11 +286,11 @@ static inline void flush_guest_tlb(struct kvm_vcpu *vcpu) static void svm_set_efer(struct kvm_vcpu *vcpu, u64 efer) { + vcpu->arch.efer = efer; if (!npt_enabled && !(efer & EFER_LMA)) efer &= ~EFER_LME; to_svm(vcpu)->vmcb->save.efer = efer | EFER_SVME; - vcpu->arch.efer = efer; } static int is_external_interrupt(u32 info) |