From mboxrd@z Thu Jan  1 00:00:00 1970
From: Igor Mammedov <imammedo@redhat.com>
Subject: [PATCH 1/2] xen: Clear IRQ_GUEST bit from irq_desc
	status if its action is NULL
Date: Tue, 13 Sep 2011 15:44:19 +0200
Message-ID: <1315921459-17059-3-git-send-email-imammedo@redhat.com>
References: <1315921459-17059-1-git-send-email-imammedo@redhat.com>
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <1315921459-17059-1-git-send-email-imammedo@redhat.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
Cc: keir.fraser@citrix.com, JBeulich@suse.com
List-Id: xen-devel@lists.xenproject.org

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Jan Beulich <JBeulich@suse.com>

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: