debuggers.hg

changeset 20906:b4244eff4384

x86: Clean up c/s 20844:ca0759a08057

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Jan 29 06:45:45 2010 +0000 (2010-01-29)
parents 2f98b700605f
children f85120520509
files xen/arch/x86/irq.c
line diff
     1.1 --- a/xen/arch/x86/irq.c	Wed Jan 27 08:59:47 2010 +0000
     1.2 +++ b/xen/arch/x86/irq.c	Fri Jan 29 06:45:45 2010 +0000
     1.3 @@ -1229,16 +1229,16 @@ static irq_guest_action_t *__pirq_guest_
     1.4  
     1.5      BUG_ON(!(desc->status & IRQ_GUEST));
     1.6  
     1.7 -    if ( unlikely((desc->status | IRQ_DISABLED) && (desc->action == NULL)) )
     1.8 +    action = (irq_guest_action_t *)desc->action;
     1.9 +    irq = desc - irq_desc;
    1.10 +
    1.11 +    if ( unlikely(action == NULL) )
    1.12      {
    1.13          dprintk(XENLOG_G_WARNING, "dom%d: pirq %d: desc->action is NULL!\n",
    1.14 -            d->domain_id, pirq);
    1.15 +                d->domain_id, pirq);
    1.16          return NULL;
    1.17      }
    1.18  
    1.19 -    action = (irq_guest_action_t *)desc->action;
    1.20 -    irq = desc - irq_desc;
    1.21 -
    1.22      for ( i = 0; (i < action->nr_guests) && (action->guest[i] != d); i++ )
    1.23          continue;
    1.24      BUG_ON(i == action->nr_guests);
    1.25 @@ -1360,7 +1360,7 @@ static int pirq_guest_force_unbind(struc
    1.26          goto out;
    1.27  
    1.28      action = (irq_guest_action_t *)desc->action;
    1.29 -    if ( unlikely((desc->status | IRQ_DISABLED) && (desc->action == NULL)) )
    1.30 +    if ( unlikely(action == NULL) )
    1.31      {
    1.32          dprintk(XENLOG_G_WARNING, "dom%d: pirq %d: desc->action is NULL!\n",
    1.33              d->domain_id, irq);