aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/vmx.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2013-04-06 07:51:21 -0400
committerGleb Natapov <gleb@redhat.com>2013-04-07 07:06:42 -0400
commitb8c07d55d010702eff61562cf9a77366833d9da2 (patch)
tree0b8edf91227f746a0471eda951b564240fbed00c /arch/x86/kvm/vmx.c
parent44944d4d28948c71b110b09a2e924e505cd39e8b (diff)
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: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Gleb Natapov <gleb@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r--arch/x86/kvm/vmx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 03f574641852..b67f35475b09 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -7402,7 +7402,7 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
7402 /* TODO: These cannot have changed unless we have MSR bitmaps and 7402 /* TODO: These cannot have changed unless we have MSR bitmaps and
7403 * the relevant bit asks not to trap the change */ 7403 * the relevant bit asks not to trap the change */
7404 vmcs12->guest_ia32_debugctl = vmcs_read64(GUEST_IA32_DEBUGCTL); 7404 vmcs12->guest_ia32_debugctl = vmcs_read64(GUEST_IA32_DEBUGCTL);
7405 if (vmcs12->vm_entry_controls & VM_EXIT_SAVE_IA32_PAT) 7405 if (vmcs12->vm_exit_controls & VM_EXIT_SAVE_IA32_PAT)
7406 vmcs12->guest_ia32_pat = vmcs_read64(GUEST_IA32_PAT); 7406 vmcs12->guest_ia32_pat = vmcs_read64(GUEST_IA32_PAT);
7407 vmcs12->guest_sysenter_cs = vmcs_read32(GUEST_SYSENTER_CS); 7407 vmcs12->guest_sysenter_cs = vmcs_read32(GUEST_SYSENTER_CS);
7408 vmcs12->guest_sysenter_esp = vmcs_readl(GUEST_SYSENTER_ESP); 7408 vmcs12->guest_sysenter_esp = vmcs_readl(GUEST_SYSENTER_ESP);