From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Leonard Subject: [PATCH ARM v5 03/20] mini-os: fixed format string error in unbind_evtchn Date: Thu, 26 Jun 2014 12:28:20 +0100 Message-ID: <1403782117-15125-4-git-send-email-talex5@gmail.com> References: <1403782117-15125-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.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X07r9-000475-8u for xen-devel@lists.xenproject.org; Thu, 26 Jun 2014 11:28:43 +0000 Received: by mail-wi0-f180.google.com with SMTP id hi2so838384wib.1 for ; Thu, 26 Jun 2014 04:28:41 -0700 (PDT) In-Reply-To: <1403782117-15125-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 Acked-by: Ian Campbell Acked-by: Samuel Thibault --- 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