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 <talex5@gmail.com>
Acked-by: Ian Campbell <ian.cammpbell@citrix.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Thomas Leonard authored and Ian Campbell committed 2014-06-27 13:38:33 +01:00
1 parent 1f04e5b76c
commit 549a29fcd8
1 file changed
+12 -13
+12 -13
View File
@@ -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)
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.