mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xen: remove port::operator int()

Browse Source 
It's dangerous as it can be invoked in unexpected places.
This commit is contained in:
Avi Kivity
2014-11-09 14:34:25 +02:00
parent 16b0013c6b
commit 14968812fe
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/xen/evtchn.hh
View File

@@ -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();

6
net/xenfront.cc
View File

@@ -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<int>(path("event-channel-tx"), int(_tx_evtchn), t);
_xenstore->write<int>(path("event-channel-rx"), int(_rx_evtchn), t);
_xenstore->write<int>(path("event-channel-tx"), _tx_evtchn.number(), t);
_xenstore->write<int>(path("event-channel-rx"), _rx_evtchn.number(), t);
_xenstore->write<int>(path("tx-ring-ref"), _tx_ring.ref, t);
_xenstore->write<int>(path("rx-ring-ref"), _rx_ring.ref, t);
_xenstore->write<int>(path("state"), 4, t);