]> Pileus Git - ~andy/linux/commitdiff
KVM: nVMX: Check exit control for VM_EXIT_SAVE_IA32_PAT, not entry controls
authorJan Kiszka <jan.kiszka@siemens.com>
Sat, 6 Apr 2013 11:51:21 +0000 (13:51 +0200)
committerGleb Natapov <gleb@redhat.com>
Sun, 7 Apr 2013 11:06:42 +0000 (14:06 +0300)
Obviously a copy&paste mistake: prepare_vmcs12 has to check L1's exit
controls for VM_EXIT_SAVE_IA32_PAT.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
arch/x86/kvm/vmx.c

index 03f574641852b294f3d59e2e594039e7e2ea10ae..b67f35475b09361b024fa1f4c02ecc8c3bbca7e3 100644 (file)
@@ -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);