External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-03 20:15:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

net_util: Remove some unneeded use of mut

Browse Source 
As identified by the new beta clippy.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-10-19 15:01:42 +01:00
parent fccd9c8829
commit 00bfb63607
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net_util/src/lib.rs
View File

@ -121,7 +121,7 @@ pub fn unregister_listener(
} }
pub fn build_net_config_space( pub fn build_net_config_space(
mut config: &mut VirtioNetConfig, config: &mut VirtioNetConfig,
mac: MacAddr, mac: MacAddr,
num_queues: usize, num_queues: usize,
avail_features: &mut u64, avail_features: &mut u64,
@ -129,7 +129,7 @@ pub fn build_net_config_space(
config.mac.copy_from_slice(mac.get_bytes()); config.mac.copy_from_slice(mac.get_bytes());
*avail_features |= 1 << VIRTIO_NET_F_MAC; *avail_features |= 1 << VIRTIO_NET_F_MAC;
build_net_config_space_with_mq(&mut config, num_queues, avail_features); build_net_config_space_with_mq(config, num_queues, avail_features);
} }
pub fn build_net_config_space_with_mq( pub fn build_net_config_space_with_mq(

23
net_util/src/queue_pair.rs
View File

@ -268,19 +268,16 @@ pub struct NetQueuePair {
} }
impl NetQueuePair { impl NetQueuePair {
pub fn process_tx(&mut self, mut queue: &mut Queue) -> Result<bool, NetQueuePairError> { pub fn process_tx(&mut self, queue: &mut Queue) -> Result<bool, NetQueuePairError> {
let mem = self let mem = self
.mem .mem
.as_ref() .as_ref()
.ok_or(NetQueuePairError::NoMemoryConfigured) .ok_or(NetQueuePairError::NoMemoryConfigured)
.map(|m| m.memory())?; .map(|m| m.memory())?;
let tx_tap_retry = self.tx.process_desc_chain( let tx_tap_retry =
&mem, self.tx
&mut self.tap, .process_desc_chain(&mem, &mut self.tap, queue, &mut self.tx_rate_limiter)?;
&mut queue,
&mut self.tx_rate_limiter,
)?;
// We got told to try again when writing to the tap. Wait for the TAP to be writable // We got told to try again when writing to the tap. Wait for the TAP to be writable
if tx_tap_retry && !self.tx_tap_listening { if tx_tap_retry && !self.tx_tap_listening {
@ -317,19 +314,17 @@ impl NetQueuePair {
Ok(queue.needs_notification(&mem, queue.next_used)) Ok(queue.needs_notification(&mem, queue.next_used))
} }
pub fn process_rx(&mut self, mut queue: &mut Queue) -> Result<bool, NetQueuePairError> { pub fn process_rx(&mut self, queue: &mut Queue) -> Result<bool, NetQueuePairError> {
let mem = self let mem = self
.mem .mem
.as_ref() .as_ref()
.ok_or(NetQueuePairError::NoMemoryConfigured) .ok_or(NetQueuePairError::NoMemoryConfigured)
.map(|m| m.memory())?; .map(|m| m.memory())?;
self.rx_desc_avail = !self.rx.process_desc_chain( self.rx_desc_avail =
&mem, !self
&mut self.tap, .rx
&mut queue, .process_desc_chain(&mem, &mut self.tap, queue, &mut self.rx_rate_limiter)?;
&mut self.rx_rate_limiter,
)?;
let rate_limit_reached = self let rate_limit_reached = self
.rx_rate_limiter .rx_rate_limiter
.as_ref() .as_ref()