[Xen-devel] [PATCH 2/2] xen: remove duplicate code and keep IRQ_GUEST flag reset at one place

[Igor Mammedov <imammedo@xxxxxxxxxx>]

Signed-off-by: Igor Mammedov <imammedo@xxxxxxxxxx>
Reviewed-by: Jan Beulich <JBeulich@xxxxxxxx>

diff -r 2049f7ca3177 -r 884814bfc22e xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c        Tue Sep 13 14:44:59 2011 +0200
+++ b/xen/arch/x86/irq.c        Tue Sep 13 14:47:46 2011 +0200
@@ -1599,12 +1599,7 @@ static int pirq_guest_force_unbind(struc
 
     action = (irq_guest_action_t *)desc->action;
     if ( unlikely(action == NULL) )
-    {
-        desc->status &= ~IRQ_GUEST;
-        dprintk(XENLOG_G_WARNING, "dom%d: pirq %d: desc->action is NULL!\n",
-            d->domain_id, pirq->pirq);
-        goto out;
-    }
+        goto unbind;
 
     for ( i = 0; (i < action->nr_guests) && (action->guest[i] != d); i++ )
         continue;
@@ -1612,6 +1607,7 @@ static int pirq_guest_force_unbind(struc
         goto out;
 
     bound = 1;
+ unbind:
     oldaction = __pirq_guest_unbind(d, pirq, desc);
 
  out:

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