summary refs log tree commit diff
path: root/arch/x86
diff options
context:
space:
mode:
authorGanShun <ganshun@google.com>2016-11-30 10:28:19 -0800
committerPaolo Bonzini <pbonzini@redhat.com>2016-12-15 15:02:44 +0100
commit37b9a671f346a184c4e381b32ee465cf7d248ae8 (patch)
treeebea4170f4a53e45a35ce6f383ca8db9a4edf46d /arch/x86
parentcdb98c2698b4af287925abcba4d77d92af82a0c3 (diff)
downloadlinux-37b9a671f346a184c4e381b32ee465cf7d248ae8.tar.gz
kvm: nVMX: Correct a VMX instruction error code for VMPTRLD
When the operand passed to VMPTRLD matches the address of the VMXON
region, the VMX instruction error code should be
VMXERR_VMPTRLD_VMXON_POINTER rather than VMXERR_VMCLEAR_VMXON_POINTER.

Signed-off-by: GanShun <ganshun@google.com>
Signed-off-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
-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 aae43c6f2472..c41d7ffdda5a 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -7122,7 +7122,7 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason,
 
 		if (vmptr == vmx->nested.vmxon_ptr) {
 			nested_vmx_failValid(vcpu,
-					     VMXERR_VMCLEAR_VMXON_POINTER);
+					     VMXERR_VMPTRLD_VMXON_POINTER);
 			return kvm_skip_emulated_instruction(vcpu);
 		}
 		break;