diff options
author | Sheng Yang <sheng.yang@intel.com> | 2008-05-14 21:52:48 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-07-20 05:42:25 -0400 |
commit | 3419ffc8e45a5344abc87684cbca6cdc5c9c8a01 (patch) | |
tree | 53d00e67ba8844800d1f73242ce42fad117f0eaf /include/asm-x86/kvm_host.h | |
parent | 50d40d7fb9b09e68a657c68837fcfa067b70cc42 (diff) |
KVM: IOAPIC/LAPIC: Enable NMI support
[avi: fix ia64 build breakage]
Signed-off-by: Sheng Yang <sheng.yang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include/asm-x86/kvm_host.h')
-rw-r--r-- | include/asm-x86/kvm_host.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index 4bcdc7de07b5..b66621935eb7 100644 --- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h | |||
@@ -288,6 +288,8 @@ struct kvm_vcpu_arch { | |||
288 | unsigned int hv_clock_tsc_khz; | 288 | unsigned int hv_clock_tsc_khz; |
289 | unsigned int time_offset; | 289 | unsigned int time_offset; |
290 | struct page *time_page; | 290 | struct page *time_page; |
291 | |||
292 | bool nmi_pending; | ||
291 | }; | 293 | }; |
292 | 294 | ||
293 | struct kvm_mem_alias { | 295 | struct kvm_mem_alias { |
@@ -515,6 +517,8 @@ void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code); | |||
515 | void kvm_inject_page_fault(struct kvm_vcpu *vcpu, unsigned long cr2, | 517 | void kvm_inject_page_fault(struct kvm_vcpu *vcpu, unsigned long cr2, |
516 | u32 error_code); | 518 | u32 error_code); |
517 | 519 | ||
520 | void kvm_inject_nmi(struct kvm_vcpu *vcpu); | ||
521 | |||
518 | void fx_init(struct kvm_vcpu *vcpu); | 522 | void fx_init(struct kvm_vcpu *vcpu); |
519 | 523 | ||
520 | int emulator_read_std(unsigned long addr, | 524 | int emulator_read_std(unsigned long addr, |