From: Thomas Leonard Subject: [PATCH ARM v4 03/12] mini-os: fixed format string error in unbind_evtchn Date: Wed, 18 Jun 2014 16:08:17 +0100 Message-ID: <1403104106-32538-4-git-send-email-talex5@gmail.com> References: <1403104106-32538-1-git-send-email-talex5@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WxHTW-0007eW-Q0 for xen-devel@lists.xenproject.org; Wed, 18 Jun 2014 15:08:34 +0000 Received: by mail-we0-f174.google.com with SMTP id u57so1017025wes.19 for ; Wed, 18 Jun 2014 08:08:33 -0700 (PDT) In-Reply-To: <1403104106-32538-1-git-send-email-talex5@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Thomas Leonard , Dave.Scott@eu.citrix.com, anil@recoil.org, stefano.stabellini@eu.citrix.com, samuel.thibault@ens-lyon.org List-Id: xen-devel@lists.xenproject.org Would crash if HYPERVISOR_event_channel_op returned an error code. The other changes in this commit are just fixing indentation. Signed-off-by: Thomas Leonard --- extras/mini-os/events.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index d60630b..f708cb4 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -109,24 +109,23 @@ evtchn_port_t bind_evtchn(evtchn_port_t port, evtchn_handler_t handler, void unbind_evtchn(evtchn_port_t port ) { - struct evtchn_close close; + struct evtchn_close close; int rc; - if ( ev_actions[port].handler == default_handler ) - printk("WARN: No handler for port %d when unbinding\n", port); - mask_evtchn(port); - clear_evtchn(port); + if ( ev_actions[port].handler == default_handler ) + printk("WARN: No handler for port %d when unbinding\n", port); + mask_evtchn(port); + clear_evtchn(port); - ev_actions[port].handler = default_handler; - wmb(); - ev_actions[port].data = NULL; - clear_bit(port, bound_ports); + ev_actions[port].handler = default_handler; + wmb(); + ev_actions[port].data = NULL; + clear_bit(port, bound_ports); - close.port = port; - rc = HYPERVISOR_event_channel_op(EVTCHNOP_close, &close); + close.port = port; + rc = HYPERVISOR_event_channel_op(EVTCHNOP_close, &close); if ( rc ) - printk("WARN: close_port %s failed rc=%d. ignored\n", port, rc); - + printk("WARN: close_port %d failed rc=%d. ignored\n", port, rc); } evtchn_port_t bind_virq(uint32_t virq, evtchn_handler_t handler, void *data) -- 2.0.0