Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e11384c authored by Ryan Harper's avatar Ryan Harper Committed by Avi Kivity
Browse files

KVM: VMX: fix typo in VMX header define 



Looking at Intel Volume 3b, page 148, table 20-11 and noticed
that the field name is 'Deliver' not 'Deliever'.  Attached patch changes
the define name and its user in vmx.c

Signed-off-by: default avatarRyan Harper <ryanh@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 709ddebf

arch/x86/kvm/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr, 
{

	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,

		     nr | INTR_TYPE_EXCEPTION

		     | (has_error_code ? INTR_INFO_DELIEVER_CODE_MASK : 0)

		     | (has_error_code ? INTR_INFO_DELIVER_CODE_MASK : 0)

		     | INTR_INFO_VALID_MASK);

	if (has_error_code)

		vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, error_code);
@@ -1935,7 +1935,7 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


	error_code = 0;

	rip = vmcs_readl(GUEST_RIP);

	if (intr_info & INTR_INFO_DELIEVER_CODE_MASK)

	if (intr_info & INTR_INFO_DELIVER_CODE_MASK)

		error_code = vmcs_read32(VM_EXIT_INTR_ERROR_CODE);

	if (is_page_fault(intr_info)) {

		cr2 = vmcs_readl(EXIT_QUALIFICATION);
@@ -2351,7 +2351,7 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu) 
		vmcs_write32(VM_ENTRY_INSTRUCTION_LEN,

				vmcs_read32(VM_EXIT_INSTRUCTION_LEN));



		if (unlikely(idtv_info_field & INTR_INFO_DELIEVER_CODE_MASK))

		if (unlikely(idtv_info_field & INTR_INFO_DELIVER_CODE_MASK))

			vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE,

				vmcs_read32(IDT_VECTORING_ERROR_CODE));

		if (unlikely(has_ext_irq))

arch/x86/kvm/vmx.h

+2 −2
Original line number Diff line number Diff line
@@ -233,12 +233,12 @@ enum vmcs_field { 
 */

#define INTR_INFO_VECTOR_MASK           0xff            /* 7:0 */

#define INTR_INFO_INTR_TYPE_MASK        0x700           /* 10:8 */

#define INTR_INFO_DELIEVER_CODE_MASK    0x800           /* 11 */

#define INTR_INFO_DELIVER_CODE_MASK     0x800           /* 11 */

#define INTR_INFO_VALID_MASK            0x80000000      /* 31 */



#define VECTORING_INFO_VECTOR_MASK           	INTR_INFO_VECTOR_MASK

#define VECTORING_INFO_TYPE_MASK        	INTR_INFO_INTR_TYPE_MASK

#define VECTORING_INFO_DELIEVER_CODE_MASK    	INTR_INFO_DELIEVER_CODE_MASK

#define VECTORING_INFO_DELIVER_CODE_MASK    	INTR_INFO_DELIVER_CODE_MASK

#define VECTORING_INFO_VALID_MASK       	INTR_INFO_VALID_MASK



#define INTR_TYPE_EXT_INTR              (0 << 8) /* external interrupt */