Commit 37b9a671 authored Nov 30, 2016 by GanShun Committed by Paolo Bonzini Dec 15, 2016

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>

parent cdb98c26

arch/x86/kvm/vmx.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7122,7 +7122,7 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason,

	if (vmptr == vmx->nested.vmxon_ptr) {		if (vmptr == vmx->nested.vmxon_ptr) {
	nested_vmx_failValid(vcpu,		nested_vmx_failValid(vcpu,
	VMXERR_VMCLEAR_VMXON_POINTER);		VMXERR_VMPTRLD_VMXON_POINTER);
	return kvm_skip_emulated_instruction(vcpu);		return kvm_skip_emulated_instruction(vcpu);
	}		}
	break;		break;