refactor: move VirtiDevice trait function testing into device.rs

Instead of testing default implementations for avail_features_by_page
and ack_features_by_page in rng and net devices, test it in device.rs

Signed-off-by: Egor Lazarchuk <[email protected]>

Author: ShadowCurse

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

@@ -194,25 +194,27 @@ macro_rules! impl_device_type {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
+    use crate::devices::virtio::generated::virtio_config::VIRTIO_F_VERSION_1;
 
     #[derive(Debug)]
     struct MockVirtioDevice {
+        avail_features: u64,
         acked_features: u64,
     }
 
     impl VirtioDevice for MockVirtioDevice {
         impl_device_type!(0);
 
         fn avail_features(&self) -> u64 {
-            todo!()
+            self.avail_features
         }
 
         fn acked_features(&self) -> u64 {
             self.acked_features
         }
 
-        fn set_acked_features(&mut self, _acked_features: u64) {
-            todo!()
+        fn set_acked_features(&mut self, acked_features: u64) {
+            self.acked_features = acked_features
         }
 
         fn queues(&self) -> &[Queue] {
@@ -254,7 +256,10 @@ pub(crate) mod tests {
 
     #[test]
     fn test_has_feature() {
-        let mut device = MockVirtioDevice { acked_features: 0 };
+        let mut device = MockVirtioDevice {
+            avail_features: 0,
+            acked_features: 0,
+        };
 
         let mock_feature_1 = 1u64;
         assert!(!device.has_feature(mock_feature_1));
@@ -267,4 +272,29 @@ pub(crate) mod tests {
         assert!(device.has_feature(mock_feature_1));
         assert!(device.has_feature(mock_feature_2));
     }
+
+    #[test]
+    fn test_features() {
+        let features = 1 << VIRTIO_F_VERSION_1;
+
+        let mut device = MockVirtioDevice {
+            avail_features: features,
+            acked_features: 0,
+        };
+
+        assert_eq!(
+            device.avail_features_by_page(0),
+            (features & 0xFFFFFFFF) as u32,
+        );
+        assert_eq!(device.avail_features_by_page(1), (features >> 32) as u32);
+        for i in 2..10 {
+            assert_eq!(device.avail_features_by_page(i), 0u32);
+        }
+
+        for i in 0..10 {
+            device.ack_features_by_page(i, u32::MAX);
+        }
+
+        assert_eq!(device.acked_features, features);
+    }
 }

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

@@ -1156,41 +1156,6 @@ pub mod tests {
         assert_eq!(net.device_type(), VIRTIO_ID_NET);
     }
 
-    #[test]
-    fn test_virtio_device_features() {
-        let mut net = default_net();
-        set_mac(&mut net, MacAddr::from_str("11:22:33:44:55:66").unwrap());
-
-        // Test `features()` and `ack_features()`.
-        let features = (1 << VIRTIO_NET_F_GUEST_CSUM)
-            | (1 << VIRTIO_NET_F_CSUM)
-            | (1 << VIRTIO_NET_F_GUEST_TSO4)
-            | (1 << VIRTIO_NET_F_GUEST_TSO6)
-            | (1 << VIRTIO_NET_F_MAC)
-            | (1 << VIRTIO_NET_F_GUEST_UFO)
-            | (1 << VIRTIO_NET_F_HOST_TSO4)
-            | (1 << VIRTIO_NET_F_HOST_TSO6)
-            | (1 << VIRTIO_NET_F_HOST_UFO)
-            | (1 << VIRTIO_F_VERSION_1)
-            | (1 << VIRTIO_NET_F_MRG_RXBUF)
-            | (1 << VIRTIO_RING_F_EVENT_IDX);
-
-        assert_eq!(
-            net.avail_features_by_page(0),
-            (features & 0xFFFFFFFF) as u32,
-        );
-        assert_eq!(net.avail_features_by_page(1), (features >> 32) as u32);
-        for i in 2..10 {
-            assert_eq!(net.avail_features_by_page(i), 0u32);
-        }
-
-        for i in 0..10 {
-            net.ack_features_by_page(i, u32::MAX);
-        }
-
-        assert_eq!(net.acked_features, features);
-    }
-
     #[test]
     // Test that `Net::build_tap_offload_features` creates the TAP offload features that we expect
     // it to do, based on the available guest features

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

@@ -410,31 +410,6 @@ mod tests {
         assert_eq!(read_config, vec![0; 10]);
     }
 
-    #[test]
-    fn test_virtio_device_features() {
-        let mut entropy_dev = default_entropy();
-
-        let features = 1 << VIRTIO_F_VERSION_1;
-
-        assert_eq!(
-            entropy_dev.avail_features_by_page(0),
-            (features & 0xFFFFFFFF) as u32,
-        );
-        assert_eq!(
-            entropy_dev.avail_features_by_page(1),
-            (features >> 32) as u32
-        );
-        for i in 2..10 {
-            assert_eq!(entropy_dev.avail_features_by_page(i), 0u32);
-        }
-
-        for i in 0..10 {
-            entropy_dev.ack_features_by_page(i, u32::MAX);
-        }
-
-        assert_eq!(entropy_dev.acked_features, features);
-    }
-
     #[test]
     fn test_handle_one() {
         let mem = create_virtio_mem();