[Xen-changelog] [xen-unstable] x86: Clean up c/s 20844:ca0759a08057

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1264747545 0
# Node ID b4244eff4384e69120b1695b44102f1276c7859d
# Parent  2f98b700605fd4c3ef20e94cfd176388ff0e7640
x86: Clean up c/s 20844:ca0759a08057

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/irq.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff -r 2f98b700605f -r b4244eff4384 xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c        Wed Jan 27 08:59:47 2010 +0000
+++ b/xen/arch/x86/irq.c        Fri Jan 29 06:45:45 2010 +0000
@@ -1229,15 +1229,15 @@ static irq_guest_action_t *__pirq_guest_
 
     BUG_ON(!(desc->status & IRQ_GUEST));
 
-    if ( unlikely((desc->status | IRQ_DISABLED) && (desc->action == NULL)) )
-    {
-        dprintk(XENLOG_G_WARNING, "dom%d: pirq %d: desc->action is NULL!\n",
-            d->domain_id, pirq);
-        return NULL;
-    }
-
     action = (irq_guest_action_t *)desc->action;
     irq = desc - irq_desc;
+
+    if ( unlikely(action == NULL) )
+    {
+        dprintk(XENLOG_G_WARNING, "dom%d: pirq %d: desc->action is NULL!\n",
+                d->domain_id, pirq);
+        return NULL;
+    }
 
     for ( i = 0; (i < action->nr_guests) && (action->guest[i] != d); i++ )
         continue;
@@ -1360,7 +1360,7 @@ static int pirq_guest_force_unbind(struc
         goto out;
 
     action = (irq_guest_action_t *)desc->action;
-    if ( unlikely((desc->status | IRQ_DISABLED) && (desc->action == NULL)) )
+    if ( unlikely(action == NULL) )
     {
         dprintk(XENLOG_G_WARNING, "dom%d: pirq %d: desc->action is NULL!\n",
             d->domain_id, irq);

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