External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-04 17:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices, net_util, vhost_user_net: Rename tap_event_id

Browse Source 
When adding a TX version the RX version should be renamed to accomodate
this.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-06-28 13:51:34 +00:00 committed by Bo Chen
parent 28b80ba42a
commit d9680c4c51
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net_util/src/queue_pair.rs
View File

@ -257,7 +257,7 @@ pub struct NetQueuePair {
pub epoll_fd: Option<RawFd>,
pub rx_tap_listening: bool,
pub counters: NetCounters,
pub tap_event_id: u16,
pub tap_rx_event_id: u16,
pub rx_desc_avail: bool,
pub rx_rate_limiter: Option<RateLimiter>,
pub tx_rate_limiter: Option<RateLimiter>,
@ -312,7 +312,7 @@ impl NetQueuePair {
self.epoll_fd.unwrap(),
self.tap.as_raw_fd(),
epoll::Events::EPOLLIN,
u64::from(self.tap_event_id),
u64::from(self.tap_rx_event_id),
)
.map_err(NetQueuePairError::UnregisterListener)?;
self.rx_tap_listening = false;

4
vhost_user_net/src/lib.rs
View File

@ -89,7 +89,7 @@ impl VhostUserNetThread {
rx_tap_listening: false,
epoll_fd: None,
counters: NetCounters::default(),
tap_event_id: 2,
tap_rx_event_id: 2,
rx_desc_avail: false,
rx_rate_limiter: None,
tx_rate_limiter: None,
@ -209,7 +209,7 @@ impl VhostUserBackend for VhostUserNetBackend {
thread.net.epoll_fd.unwrap(),
thread.net.tap.as_raw_fd(),
epoll::Events::EPOLLIN,
u64::from(thread.net.tap_event_id),
u64::from(thread.net.tap_rx_event_id),
)
.map_err(Error::RegisterTapListener)?;
thread.net.rx_tap_listening = true;

6
virtio-devices/src/net.rs
View File

@ -161,7 +161,7 @@ impl NetEpollHandler {
self.net.epoll_fd.unwrap(),
self.net.tap.as_raw_fd(),
epoll::Events::EPOLLIN,
u64::from(self.net.tap_event_id),
u64::from(self.net.tap_rx_event_id),
)
.map_err(DeviceError::IoError)?;
self.net.rx_tap_listening = true;
@ -289,7 +289,7 @@ impl EpollHelperHandler for NetEpollHandler {
self.net.epoll_fd.unwrap(),
self.net.tap.as_raw_fd(),
epoll::Events::EPOLLIN,
u64::from(self.net.tap_event_id),
u64::from(self.net.tap_rx_event_id),
) {
error!("Error register_listener with `RX_RATE_LIMITER_EVENT`: {:?}", e);
return true;
@ -627,7 +627,7 @@ impl VirtioDevice for Net {
epoll_fd: None,
rx_tap_listening,
counters: self.counters.clone(),
tap_event_id: RX_TAP_EVENT,
tap_rx_event_id: RX_TAP_EVENT,
rx_desc_avail: false,
rx_rate_limiter,
tx_rate_limiter,