diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-09-18 13:43:30 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-09-18 13:43:30 +0100 |
| commit | 6e793550f6462105395a3b390374fc598b05506e (patch) | |
| tree | 94d5305066cb53aec48c420fff413e166e9f6100 /xen/arch/x86/hvm/irq.c | |
| parent | 623e83716791e0f0d938132eb7a8f5edbe3e8cb2 (diff) | |
| download | xen-6e793550f6462105395a3b390374fc598b05506e.tar.gz xen-6e793550f6462105395a3b390374fc598b05506e.tar.bz2 xen-6e793550f6462105395a3b390374fc598b05506e.zip | |
Revert 15826:447db1235adf1bc59bbd76c951716c3df7ee8843.
Re-enables NMI delivery in HVM guests now that hardware task switching
is emulated.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/hvm/irq.c')
| -rw-r--r-- | xen/arch/x86/hvm/irq.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index a83f6cae67..b41295a273 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -306,14 +306,7 @@ int hvm_vcpu_ack_pending_irq(struct vcpu *v, enum hvm_intack type, int *vector) switch ( type ) { case hvm_intack_nmi: -#if 0 return test_and_clear_bool(v->nmi_pending); -#else - if ( test_and_clear_bool(v->nmi_pending) ) - gdprintk(XENLOG_WARNING, "Dropping NMI delivery to %d:%d\n", - v->domain->domain_id, v->vcpu_id); - break; -#endif case hvm_intack_lapic: return ((*vector = cpu_get_apic_interrupt(v)) != -1); case hvm_intack_pic: |