diff options
author | Ryan Harper <ryanh@us.ibm.com> | 2008-02-11 11:26:38 -0500 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-04-27 04:53:21 -0400 |
commit | 2e11384c2c6f1ce662b1e5b05ba49b216a052f2a (patch) | |
tree | 694fecbf8caf6fc1618bfa0920cc5dc7e1c72c5b | |
parent | 709ddebf81cb40e3c36c6109a7892e8b93a09464 (diff) |
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: Ryan Harper <ryanh@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
-rw-r--r-- | arch/x86/kvm/vmx.c | 6 | ||||
-rw-r--r-- | arch/x86/kvm/vmx.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 76944f2c883b..2d5ccec3f9e7 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -632,7 +632,7 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr, | |||
632 | { | 632 | { |
633 | vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, | 633 | vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, |
634 | nr | INTR_TYPE_EXCEPTION | 634 | nr | INTR_TYPE_EXCEPTION |
635 | | (has_error_code ? INTR_INFO_DELIEVER_CODE_MASK : 0) | 635 | | (has_error_code ? INTR_INFO_DELIVER_CODE_MASK : 0) |
636 | | INTR_INFO_VALID_MASK); | 636 | | INTR_INFO_VALID_MASK); |
637 | if (has_error_code) | 637 | if (has_error_code) |
638 | vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, error_code); | 638 | 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) | |||
1935 | 1935 | ||
1936 | error_code = 0; | 1936 | error_code = 0; |
1937 | rip = vmcs_readl(GUEST_RIP); | 1937 | rip = vmcs_readl(GUEST_RIP); |
1938 | if (intr_info & INTR_INFO_DELIEVER_CODE_MASK) | 1938 | if (intr_info & INTR_INFO_DELIVER_CODE_MASK) |
1939 | error_code = vmcs_read32(VM_EXIT_INTR_ERROR_CODE); | 1939 | error_code = vmcs_read32(VM_EXIT_INTR_ERROR_CODE); |
1940 | if (is_page_fault(intr_info)) { | 1940 | if (is_page_fault(intr_info)) { |
1941 | cr2 = vmcs_readl(EXIT_QUALIFICATION); | 1941 | cr2 = vmcs_readl(EXIT_QUALIFICATION); |
@@ -2351,7 +2351,7 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu) | |||
2351 | vmcs_write32(VM_ENTRY_INSTRUCTION_LEN, | 2351 | vmcs_write32(VM_ENTRY_INSTRUCTION_LEN, |
2352 | vmcs_read32(VM_EXIT_INSTRUCTION_LEN)); | 2352 | vmcs_read32(VM_EXIT_INSTRUCTION_LEN)); |
2353 | 2353 | ||
2354 | if (unlikely(idtv_info_field & INTR_INFO_DELIEVER_CODE_MASK)) | 2354 | if (unlikely(idtv_info_field & INTR_INFO_DELIVER_CODE_MASK)) |
2355 | vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, | 2355 | vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, |
2356 | vmcs_read32(IDT_VECTORING_ERROR_CODE)); | 2356 | vmcs_read32(IDT_VECTORING_ERROR_CODE)); |
2357 | if (unlikely(has_ext_irq)) | 2357 | if (unlikely(has_ext_irq)) |
diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h index 436ce0f29092..5dff4606b988 100644 --- a/arch/x86/kvm/vmx.h +++ b/arch/x86/kvm/vmx.h | |||
@@ -233,12 +233,12 @@ enum vmcs_field { | |||
233 | */ | 233 | */ |
234 | #define INTR_INFO_VECTOR_MASK 0xff /* 7:0 */ | 234 | #define INTR_INFO_VECTOR_MASK 0xff /* 7:0 */ |
235 | #define INTR_INFO_INTR_TYPE_MASK 0x700 /* 10:8 */ | 235 | #define INTR_INFO_INTR_TYPE_MASK 0x700 /* 10:8 */ |
236 | #define INTR_INFO_DELIEVER_CODE_MASK 0x800 /* 11 */ | 236 | #define INTR_INFO_DELIVER_CODE_MASK 0x800 /* 11 */ |
237 | #define INTR_INFO_VALID_MASK 0x80000000 /* 31 */ | 237 | #define INTR_INFO_VALID_MASK 0x80000000 /* 31 */ |
238 | 238 | ||
239 | #define VECTORING_INFO_VECTOR_MASK INTR_INFO_VECTOR_MASK | 239 | #define VECTORING_INFO_VECTOR_MASK INTR_INFO_VECTOR_MASK |
240 | #define VECTORING_INFO_TYPE_MASK INTR_INFO_INTR_TYPE_MASK | 240 | #define VECTORING_INFO_TYPE_MASK INTR_INFO_INTR_TYPE_MASK |
241 | #define VECTORING_INFO_DELIEVER_CODE_MASK INTR_INFO_DELIEVER_CODE_MASK | 241 | #define VECTORING_INFO_DELIVER_CODE_MASK INTR_INFO_DELIVER_CODE_MASK |
242 | #define VECTORING_INFO_VALID_MASK INTR_INFO_VALID_MASK | 242 | #define VECTORING_INFO_VALID_MASK INTR_INFO_VALID_MASK |
243 | 243 | ||
244 | #define INTR_TYPE_EXT_INTR (0 << 8) /* external interrupt */ | 244 | #define INTR_TYPE_EXT_INTR (0 << 8) /* external interrupt */ |