xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Igor Mammedov <imammedo@redhat.com>
To: xen-devel@lists.xensource.com
Cc: keir.fraser@citrix.com, JBeulich@suse.com
Subject: [PATCH 2/2] xen: remove duplicate code and keep IRQ_GUEST flag reset at one place
Date: Tue, 13 Sep 2011 15:54:02 +0200	[thread overview]
Message-ID: <1315922042-17297-1-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <1315921459-17059-1-git-send-email-imammedo@redhat.com>

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:

  parent reply	other threads:[~2011-09-13 13:54 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-13 13:44 [PATCH 0/2] Prevent host crash after executing in dom0 'rmmod isci; modprobe isci' Igor Mammedov
2011-09-13 13:44 ` [PATCH 1/2] xen: Clear IRQ_GUEST bit from irq_desc status if its action is NULL Igor Mammedov
2011-09-13 13:44 ` Igor Mammedov
2011-09-13 13:56   ` Igor Mammedov
2011-09-13 13:54 ` Igor Mammedov [this message]
2011-09-16  9:13 ` [PATCH 0/2] Prevent host crash after executing in dom0 'rmmod isci; modprobe isci' Igor Mammedov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1315922042-17297-1-git-send-email-imammedo@redhat.com \
    --to=imammedo@redhat.com \
    --cc=JBeulich@suse.com \
    --cc=keir.fraser@citrix.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).