From: GanShun <ganshun@google.com>
Date: Wed, 30 Nov 2016 18:28:19 +0000 (-0800)
Subject: kvm: nVMX: Correct a VMX instruction error code for VMPTRLD
X-Git-Tag: v4.10-rc1~44^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=37b9a671f346a184c4e381b32ee465cf7d248ae8;p=karo-tx-linux.git

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>
---

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;