Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8c07d55 authored by Jan Kiszka's avatar Jan Kiszka Committed by Gleb Natapov
Browse files

KVM: nVMX: Check exit control for VM_EXIT_SAVE_IA32_PAT, not entry controls 



Obviously a copy&paste mistake: prepare_vmcs12 has to check L1's exit
controls for VM_EXIT_SAVE_IA32_PAT.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent 44944d4d

arch/x86/kvm/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -7402,7 +7402,7 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) 
	/* TODO: These cannot have changed unless we have MSR bitmaps and

	 * the relevant bit asks not to trap the change */

	vmcs12->guest_ia32_debugctl = vmcs_read64(GUEST_IA32_DEBUGCTL);

	if (vmcs12->vm_entry_controls & VM_EXIT_SAVE_IA32_PAT)

	if (vmcs12->vm_exit_controls & VM_EXIT_SAVE_IA32_PAT)

		vmcs12->guest_ia32_pat = vmcs_read64(GUEST_IA32_PAT);

	vmcs12->guest_sysenter_cs = vmcs_read32(GUEST_SYSENTER_CS);

	vmcs12->guest_sysenter_esp = vmcs_readl(GUEST_SYSENTER_ESP);