[Xen-changelog] [xen-unstable] x86: fixes after emuirq changes

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1291052672 0
# Node ID d281061e6ec06bbbf8e2b0fadbeb9d1a04bc32e2
# Parent  3afb5ecbf69fafc1c7107110d010138bb60e5d87
x86: fixes after emuirq changes

Signed-off-by: Wei Wang <wei.wang2@xxxxxxx>
---
 xen/arch/x86/irq.c     |    3 ++-
 xen/arch/x86/physdev.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff -r 3afb5ecbf69f -r d281061e6ec0 xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c        Mon Nov 29 14:40:55 2010 +0000
+++ b/xen/arch/x86/irq.c        Mon Nov 29 17:44:32 2010 +0000
@@ -1860,7 +1860,8 @@ int unmap_domain_pirq_emuirq(struct doma
     }
 
     d->arch.pirq_emuirq[pirq] = IRQ_UNBOUND;
-    d->arch.emuirq_pirq[emuirq] = IRQ_UNBOUND;
+    if ( emuirq != IRQ_PT )
+        d->arch.emuirq_pirq[emuirq] = IRQ_UNBOUND;
 
  done:
     return ret;
diff -r 3afb5ecbf69f -r d281061e6ec0 xen/arch/x86/physdev.c
--- a/xen/arch/x86/physdev.c    Mon Nov 29 14:40:55 2010 +0000
+++ b/xen/arch/x86/physdev.c    Mon Nov 29 17:44:32 2010 +0000
@@ -236,7 +236,8 @@ static int physdev_unmap_pirq(struct phy
         spin_lock(&d->event_lock);
         ret = unmap_domain_pirq_emuirq(d, unmap->pirq);
         spin_unlock(&d->event_lock);
-        goto free_domain;
+        if ( unmap->domid == DOMID_SELF || ret )
+            goto free_domain;
     }
 
     ret = -EPERM;

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