diff options
| author |   mikeb <mikeb@openbsd.org> | 2015-12-21 18:13:44 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2015-12-21 18:13:44 +0000 |
| commit | e615459dc9f3fcea9424ec3856bd47fe638aa0a3 (patch) | |
| tree | d85071de01117fd945942610f2465e15330c9350 | |
| parent | Switch to 'file' backend for aliases table for default configuration. (diff) | |
| download | wireguard-openbsd-e615459dc9f3fcea9424ec3856bd47fe638aa0a3.tar.xz wireguard-openbsd-e615459dc9f3fcea9424ec3856bd47fe638aa0a3.zip | |
Don't unmask the port in xen_intr_establish
| -rw-r--r-- | sys/dev/pv/xen.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sys/dev/pv/xen.c b/sys/dev/pv/xen.c index bb31010ccec..b1e692ecd3a 100644 --- a/sys/dev/pv/xen.c +++ b/sys/dev/pv/xen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xen.c,v 1.15 2015/12/19 09:11:14 mikeb Exp $ */ +/* $OpenBSD: xen.c,v 1.16 2015/12/21 18:13:44 mikeb Exp $ */ /* * Copyright (c) 2015 Mike Belopuhov @@ -563,16 +563,15 @@ xen_intr_establish(evtchn_port_t port, xen_intr_handle_t *xih, struct xen_softc *sc = xen_sc; struct xen_intsrc *xi; struct evtchn_alloc_unbound eau; - struct evtchn_unmask eu; #if notyet struct evtchn_bind_vcpu ebv; #endif -#ifdef XEN_DEBUG +#if defined(XEN_DEBUG) && disabled struct evtchn_status es; #endif if (port && xen_lookup_intsrc(sc, port)) { - printf("%s: interrupt handler has already been established " + DPRINTF("%s: interrupt handler has already been established " "for port %u\n", sc->sc_dev.dv_xname, port); return (-1); } @@ -621,15 +620,7 @@ xen_intr_establish(evtchn_port_t port, xen_intr_handle_t *xih, SLIST_INSERT_HEAD(&sc->sc_intrs, xi, xi_entry); - if (!cold) { - eu.port = xi->xi_port; - if (xen_hypercall(sc, event_channel_op, 2, EVTCHNOP_unmask, - &eu) || isset(sc->sc_ipg->evtchn_mask, xi->xi_port)) - printf("%s: unmasking port %u failed\n", - sc->sc_dev.dv_xname, xi->xi_port); - } - -#ifdef XEN_DEBUG +#if defined(XEN_DEBUG) && disabled memset(&es, 0, sizeof(es)); es.dom = DOMID_SELF; es.port = xi->xi_port; |