Commit 9e9c3fe4 authored Apr 12, 2015 by Nadav Amit Committed by Paolo Bonzini Apr 14, 2015

KVM: x86: Fix MSR_IA32_BNDCFGS in msrs_to_save



kvm_init_msr_list is currently called before hardware_setup. As a result,
vmx_mpx_supported always returns false when kvm_init_msr_list checks whether to
save MSR_IA32_BNDCFGS.

Move kvm_init_msr_list after vmx_hardware_setup is called to fix this issue.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>

Message-Id: <1428864435-4732-1-git-send-email-namit@cs.technion.ac.il>
Cc: stable@vger.kernel.org # 3.15+
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent b79013b2

arch/x86/kvm/x86.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -5799,7 +5799,6 @@ int kvm_arch_init(void *opaque)
		kvm_set_mmio_spte_mask();

		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);
		@@ -7253,7 +7252,14 @@ void kvm_arch_hardware_disable(void)

		int kvm_arch_hardware_setup(void)
		{
		return kvm_x86_ops->hardware_setup();
		int r;

		r = kvm_x86_ops->hardware_setup();
		if (r != 0)
		return r;

		kvm_init_msr_list();
		return 0;
		}

		void kvm_arch_hardware_unsetup(void)