From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jim Mattson Subject: [PATCH v2] kvm: nVMX: Correct a VMX instruction error code for VMPTRLD Date: Wed, 30 Nov 2016 10:28:19 -0800 Message-ID: <1480530499-19098-1-git-send-email-jmattson@google.com> References: Cc: GanShun , Jim Mattson To: kvm@vger.kernel.org Return-path: Received: from mail-pf0-f172.google.com ([209.85.192.172]:36533 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757409AbcK3S2u (ORCPT ); Wed, 30 Nov 2016 13:28:50 -0500 Received: by mail-pf0-f172.google.com with SMTP id 189so40448137pfz.3 for ; Wed, 30 Nov 2016 10:28:50 -0800 (PST) In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: From: GanShun 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: Jim Mattson --- arch/x86/kvm/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 0c4cde8..a1c7a43 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6960,7 +6960,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); skip_emulated_instruction(vcpu); return 1; } -- 2.8.0.rc3.226.g39d4020