From: Thomas Leonard Date: Thu, 26 Jun 2014 11:28:20 +0000 (+0100) Subject: mini-os: fixed format string error in unbind_evtchn X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fe0818c3f25cfbff90b76c3be8e24b8a9a29bf76;p=people%2Fliuw%2Flibxenctrl-split%2Fmini-os.git mini-os: fixed format string error in unbind_evtchn 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 --- diff --git a/events.c b/events.c index d60630b..f708cb4 100644 --- a/events.c +++ b/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)