diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2008-10-20 10:20:02 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-12-31 16:51:46 +0200 |
| commit | 8fdb2351d51b040146f10a624387bbd102d851c0 (patch) | |
| tree | c28ff5ec61f51cb1a04b7e29923e4ce3f2aba421 /arch/x86/kvm/irq.h | |
| parent | 291fd39bfc2089c2dae79cf2d7cfca81b14ca769 (diff) | |
| download | op-kernel-dev-8fdb2351d51b040146f10a624387bbd102d851c0.zip op-kernel-dev-8fdb2351d51b040146f10a624387bbd102d851c0.tar.gz | |
KVM: x86: Fix and refactor NMI watchdog emulation
This patch refactors the NMI watchdog delivery patch, consolidating
tests and providing a proper API for delivering watchdog events.
An included micro-optimization is to check only for apic_hw_enabled in
kvm_apic_local_deliver (the test for LVT mask is covering the
soft-disabled case already).
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/irq.h')
| -rw-r--r-- | arch/x86/kvm/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h index 71e37a5..b9e9051 100644 --- a/arch/x86/kvm/irq.h +++ b/arch/x86/kvm/irq.h @@ -87,7 +87,7 @@ void kvm_pic_reset(struct kvm_kpic_state *s); void kvm_timer_intr_post(struct kvm_vcpu *vcpu, int vec); void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu); -int kvm_apic_local_deliver(struct kvm_vcpu *vcpu, int lvt_type); +void kvm_apic_nmi_wd_deliver(struct kvm_vcpu *vcpu); void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu); void __kvm_migrate_timers(struct kvm_vcpu *vcpu); |
