fix style and a note from the pr

Signed-off-by: Nikita Zakirov <[email protected]>

Author: Nikita Zakirov

src/vmm/src/devices/virtio/net/device.rs

@@ -24,7 +24,8 @@ use crate::devices::virtio::device::{DeviceState, IrqTrigger, IrqType, VirtioDev
 use crate::devices::virtio::gen::virtio_blk::VIRTIO_F_VERSION_1;
 use crate::devices::virtio::gen::virtio_net::{
     virtio_net_hdr_v1, VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GUEST_CSUM, VIRTIO_NET_F_GUEST_TSO4,
-    VIRTIO_NET_F_GUEST_TSO6, VIRTIO_NET_F_GUEST_UFO, VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_MAC,
+    VIRTIO_NET_F_GUEST_TSO6, VIRTIO_NET_F_GUEST_UFO, VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO,
+    VIRTIO_NET_F_MAC,
 };
 use crate::devices::virtio::gen::virtio_ring::VIRTIO_RING_F_EVENT_IDX;
 use crate::devices::virtio::iovec::IoVecBuffer;
@@ -641,12 +642,12 @@ impl Net {
         }
     }
 
-    fn build_tap_supported_features(desired_flags: Vec<(u32, u32)>, supported_features: u64) -> u32 {
-        let mut answer : u32 = 0;
+    fn build_tap_supported_features(desired_flags: &[(u32, u32)], supported_features: u64) -> u32 {
+        let mut answer: u32 = 0;
 
-        for i in 0..desired_flags.len() {
-            if (supported_features & 1 << desired_flags[i].1) != 0 {
-                answer |= desired_flags[i].0
+        for (tap_flag, net_flag) in desired_flags.iter() {
+            if (supported_features & 1 << net_flag) != 0 {
+                answer |= tap_flag;
             }
         }
 
@@ -868,14 +869,15 @@ impl VirtioDevice for Net {
             }
         }
 
-        let desired_flags = vec![
+        let desired_flags = [
             (gen::TUN_F_CSUM, VIRTIO_NET_F_CSUM),
             (gen::TUN_F_UFO, VIRTIO_NET_F_GUEST_UFO),
             (gen::TUN_F_TSO4, VIRTIO_NET_F_GUEST_TSO4),
-            (gen::TUN_F_TSO6, VIRTIO_NET_F_GUEST_TSO6)
+            (gen::TUN_F_TSO6, VIRTIO_NET_F_GUEST_TSO6),
         ];
 
-        let supported_flags = Net::build_tap_supported_features(desired_flags, self.acked_features());
+        let supported_flags =
+            Net::build_tap_supported_features(&desired_flags, self.acked_features());
         if self.tap.set_offload(supported_flags).is_err() {
             return Err(super::super::ActivateError::TapSetOffload);
         }
@@ -1022,63 +1024,66 @@ pub mod tests {
     // We can't get offload features, that were set up to a TAP device by ioctl,
     // hence that we have to validate, that we sort out unsupported features correctly
     fn test_build_tap_supported_features_all() {
-        let desired_features = vec![
+        let desired_features = [
             (gen::TUN_F_CSUM, VIRTIO_NET_F_CSUM),
             (gen::TUN_F_UFO, VIRTIO_NET_F_GUEST_UFO),
             (gen::TUN_F_TSO4, VIRTIO_NET_F_GUEST_TSO4),
-            (gen::TUN_F_TSO6, VIRTIO_NET_F_GUEST_TSO6)
+            (gen::TUN_F_TSO6, VIRTIO_NET_F_GUEST_TSO6),
         ];
 
-        let mut tap_features : u32 = 0;
-        let mut ack_features : u32 = 0;
+        let mut tap_features: u32 = 0;
+        let mut ack_features: u32 = 0;
 
-        for i in 0.. desired_features.len() {
+        for i in 0..desired_features.len() {
             tap_features |= desired_features[i].0;
             ack_features |= 1 << desired_features[i].1;
         }
 
-        let supported_flags = Net::build_tap_supported_features(desired_features, ack_features as u64);
+        let supported_flags =
+            Net::build_tap_supported_features(&desired_features, ack_features as u64);
 
         assert_eq!(supported_flags, tap_features);
     }
 
     #[test]
     fn test_build_tap_supported_features_ack_les_than_want() {
-        let desired_features = vec![
+        let desired_features = [
             (gen::TUN_F_CSUM, VIRTIO_NET_F_CSUM),
             (gen::TUN_F_UFO, VIRTIO_NET_F_GUEST_UFO),
             (gen::TUN_F_TSO4, VIRTIO_NET_F_GUEST_TSO4),
-            (gen::TUN_F_TSO6, VIRTIO_NET_F_GUEST_TSO6)
+            (gen::TUN_F_TSO6, VIRTIO_NET_F_GUEST_TSO6),
         ];
 
-        let tap_features : u32 = gen::TUN_F_CSUM | gen::TUN_F_UFO;
-        let ack_features : u32 = 1 << VIRTIO_NET_F_CSUM | 1 << VIRTIO_NET_F_GUEST_UFO;
+        let tap_features: u32 = gen::TUN_F_CSUM | gen::TUN_F_UFO;
+        let ack_features: u32 = 1 << VIRTIO_NET_F_CSUM | 1 << VIRTIO_NET_F_GUEST_UFO;
 
-        let supported_flags = Net::build_tap_supported_features(desired_features, ack_features as u64);
+        let supported_flags =
+            Net::build_tap_supported_features(&desired_features, ack_features as u64);
 
         assert_eq!(supported_flags, tap_features);
     }
 
     #[test]
     fn test_build_tap_supported_features_ack_more_than_want() {
-        let desired_features = vec![
+        let desired_features = [
             (gen::TUN_F_CSUM, VIRTIO_NET_F_CSUM),
             (gen::TUN_F_UFO, VIRTIO_NET_F_GUEST_UFO),
             (gen::TUN_F_TSO4, VIRTIO_NET_F_GUEST_TSO4),
         ];
 
-        let mut tap_features : u32 = 0;
-        let mut ack_features : u32 = 0;
+        let mut tap_features: u32 = 0;
+        let mut ack_features: u32 = 0;
 
-        for i in 0.. desired_features.len() {
+        for i in 0..desired_features.len() {
             tap_features |= desired_features[i].0;
             ack_features |= 1 << desired_features[i].1;
         }
 
         // extra supported feature
         ack_features |= 1 << VIRTIO_NET_F_GUEST_TSO6;
 
-        let supported_flags = Net::build_tap_supported_features(desired_features, ack_features as u64);
+        let supported_flags =
+            Net::build_tap_supported_features(&desired_features, ack_features as u64);
 
         assert_eq!(supported_flags, tap_features);
     }