[Xen-changelog] [xen-unstable] Revert 15826:447db1235adf1bc59bbd76c951716c3df7ee8843.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1190119410 -3600
# Node ID 3727f7570dff1a2982515ad316317d0d16d303b8
# Parent  35fb20c4822c40ca404fe61b1734b063b80047a6
Revert 15826:447db1235adf1bc59bbd76c951716c3df7ee8843.

Re-enables NMI delivery in HVM guests now that hardware task switching
is emulated.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/irq.c |    7 -------
 1 files changed, 7 deletions(-)

diff -r 35fb20c4822c -r 3727f7570dff xen/arch/x86/hvm/irq.c
--- a/xen/arch/x86/hvm/irq.c    Tue Sep 18 11:49:42 2007 +0100
+++ b/xen/arch/x86/hvm/irq.c    Tue Sep 18 13:43:30 2007 +0100
@@ -306,14 +306,7 @@ int hvm_vcpu_ack_pending_irq(struct vcpu
     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:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog