aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorSheng Yang <sheng.yang@intel.com>2008-05-14 21:52:48 -0400
committerAvi Kivity <avi@qumranet.com>2008-07-20 05:42:25 -0400
commit3419ffc8e45a5344abc87684cbca6cdc5c9c8a01 (patch)
tree53d00e67ba8844800d1f73242ce42fad117f0eaf /arch/x86/kvm/x86.c
parent50d40d7fb9b09e68a657c68837fcfa067b70cc42 (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 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 5f00c60f0aff..19974dde6567 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -173,6 +173,12 @@ void kvm_inject_page_fault(struct kvm_vcpu *vcpu, unsigned long addr,
173 kvm_queue_exception_e(vcpu, PF_VECTOR, error_code); 173 kvm_queue_exception_e(vcpu, PF_VECTOR, error_code);
174} 174}
175 175
176void kvm_inject_nmi(struct kvm_vcpu *vcpu)
177{
178 vcpu->arch.nmi_pending = 1;
179}
180EXPORT_SYMBOL_GPL(kvm_inject_nmi);
181
176void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code) 182void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code)
177{ 183{
178 WARN_ON(vcpu->arch.exception.pending); 184 WARN_ON(vcpu->arch.exception.pending);