ia64/xen-unstable

changeset 15920:3727f7570dff

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>
author kfraser@localhost.localdomain
date Tue Sep 18 13:43:30 2007 +0100 (2007-09-18)
parents 35fb20c4822c
children 15babb02bc75
files xen/arch/x86/hvm/irq.c
line diff
     1.1 --- a/xen/arch/x86/hvm/irq.c	Tue Sep 18 11:49:42 2007 +0100
     1.2 +++ b/xen/arch/x86/hvm/irq.c	Tue Sep 18 13:43:30 2007 +0100
     1.3 @@ -306,14 +306,7 @@ int hvm_vcpu_ack_pending_irq(struct vcpu
     1.4      switch ( type )
     1.5      {
     1.6      case hvm_intack_nmi:
     1.7 -#if 0
     1.8          return test_and_clear_bool(v->nmi_pending);
     1.9 -#else
    1.10 -        if ( test_and_clear_bool(v->nmi_pending) )
    1.11 -            gdprintk(XENLOG_WARNING, "Dropping NMI delivery to %d:%d\n",
    1.12 -                     v->domain->domain_id, v->vcpu_id);
    1.13 -        break;
    1.14 -#endif
    1.15      case hvm_intack_lapic:
    1.16          return ((*vector = cpu_get_apic_interrupt(v)) != -1);
    1.17      case hvm_intack_pic: