summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-03-26 15:54:00 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-03-27 13:06:51 +0100
commit920c837785699bcc48f4a729ba9ee3492f620b95 (patch)
tree51d7603c319a7c094534bc2ca5c80ffe178eee2d /arch
parentf7b9ddb8a5e8a25954217fa25d114bd8cf4491a4 (diff)
downloadlinux-stable-920c837785699bcc48f4a729ba9ee3492f620b95.tar.gz
linux-stable-920c837785699bcc48f4a729ba9ee3492f620b95.tar.bz2
linux-stable-920c837785699bcc48f4a729ba9ee3492f620b95.zip
KVM: vmx: fix MPX detection
kvm_x86_ops is still NULL at this point. Since kvm_init_msr_list cannot fail, it is safe to initialize it before the call. Fixes: 93c4adc7afedf9b0ec190066d45b6d67db5270da Reported-by: Fengguang Wu <fengguang.wu@intel.com> Tested-by: Jet Chen <jet.chen@intel.com> Cc: kvm@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/x86.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index aa986959f237..d1c55f8722c6 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5594,9 +5594,10 @@ int kvm_arch_init(void *opaque)
goto out_free_percpu;
kvm_set_mmio_spte_mask();
- kvm_init_msr_list();
kvm_x86_ops = ops;
+ kvm_init_msr_list();
+
kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK,
PT_DIRTY_MASK, PT64_NX_MASK, 0);