diff --git a/core/xen/evtchn.hh b/core/xen/evtchn.hh index b01b1dab6a..d5837cdb58 100644 --- a/core/xen/evtchn.hh +++ b/core/xen/evtchn.hh @@ -14,7 +14,7 @@ public: port(int p); port(port&& other); ~port(); - operator int() { return _port; } + int number() const { return _port; } future<> pending(); void notify(); diff --git a/net/xenfront.cc b/net/xenfront.cc index f5d0171613..1f2149a6b5 100644 --- a/net/xenfront.cc +++ b/net/xenfront.cc @@ -271,7 +271,7 @@ port xenfront_net_device::bind_rx_evtchn() { if (split) { return _evtchn->bind(); } - return _evtchn->bind(_tx_evtchn); + return _evtchn->bind(_tx_evtchn.number()); } xenfront_net_device::xenfront_net_device(boost::program_options::variables_map opts, bool userspace) @@ -316,8 +316,8 @@ xenfront_net_device::xenfront_net_device(boost::program_options::variables_map o _xenstore->write(path(f.first), f.second, t); } - _xenstore->write(path("event-channel-tx"), int(_tx_evtchn), t); - _xenstore->write(path("event-channel-rx"), int(_rx_evtchn), t); + _xenstore->write(path("event-channel-tx"), _tx_evtchn.number(), t); + _xenstore->write(path("event-channel-rx"), _rx_evtchn.number(), t); _xenstore->write(path("tx-ring-ref"), _tx_ring.ref, t); _xenstore->write(path("rx-ring-ref"), _rx_ring.ref, t); _xenstore->write(path("state"), 4, t);