fixed unit tests

src/vmm/src/device_manager/mmio.rs

@@ -143,16 +143,13 @@ impl MMIODeviceManager {
         resource_allocator: &mut ResourceAllocator,
         irq_count: u32,
     ) -> Result<MMIODeviceInfo, MmioError> {
-        assert!(irq_count == 0 || irq_count == 1, "irq_count must be equal to 0 or 1");
+        if irq_count != 0 && irq_count != 1 {
+            return Err(MmioError::InvalidIrqConfig);
+        }
         let irqs_vec = resource_allocator.allocate_gsi(irq_count)?; 
         let irq : Option<NonZeroU32> = if irqs_vec.len() == 0 {
             None
         } else {
-    //         let temp_vec: Vec<u32> = factors
-    // .iter()
-    // .copied()
-    // .filter(|&x| x != 0)
-    // .collect();
             NonZeroU32::new(irqs_vec.get(0).unwrap().clone())
         };
 
@@ -566,13 +563,19 @@ mod tests {
         /// Gets the number of interrupts used by the devices registered.
         pub fn used_irqs_count(&self) -> usize {
             let mut irq_number = 0;
-            // self.get_device_info()
-            //     .iter()
-            //     .for_each(|(_, device_info)| irq_number += device_info.irqs.len());
-            if(device_info.irq.is_none()) {
-                return irq_number;
-            }
-            ++irq_number
+            self.get_device_info()
+                .iter()
+                .for_each(|(_, device_info)| irq_number += 
+                if device_info.irq.is_none() {
+                    0
+                } else {
+                    1
+                }
+
+            );
+
+            irq_number
+
         }
     }
 
@@ -738,6 +741,7 @@ mod tests {
         assert_eq!(dummy.queues().len(), QUEUE_SIZES.len());
     }
 
+    // NOTE: we are also failing this test now 
     #[test]
     fn test_device_info() {
         let start_addr1 = GuestAddress(0x0);
@@ -822,11 +826,11 @@ mod tests {
         let device_info = device_manager
             .allocate_mmio_resources(&mut resource_allocator, 0)
             .unwrap();
-        assert_eq!(device_info.irqs.len(), 0);
+        assert!(device_info.irq.is_none());
         let device_info = device_manager
             .allocate_mmio_resources(&mut resource_allocator, 1)
             .unwrap();
-        assert_eq!(device_info.irqs[0], crate::arch::IRQ_BASE);
+        assert_eq!(device_info.irq.unwrap().get(), crate::arch::IRQ_BASE);
         assert_eq!(
             format!(
                 "{}",
@@ -837,25 +841,17 @@ mod tests {
                     )
                     .unwrap_err()
             ),
-            "Failed to allocate requested resource: The requested resource is not available."
+            "Invalid MMIO IRQ configuration."
                 .to_string()
         );
-
-        let device_info = device_manager
-            .allocate_mmio_resources(
-                &mut resource_allocator,
-                crate::arch::IRQ_MAX - crate::arch::IRQ_BASE - 1,
-            )
-            .unwrap();
-        assert_eq!(device_info.irqs[16], crate::arch::IRQ_BASE + 17);
         assert_eq!(
             format!(
                 "{}",
                 device_manager
                     .allocate_mmio_resources(&mut resource_allocator, 2)
                     .unwrap_err()
             ),
-            "Failed to allocate requested resource: The requested resource is not available."
+            "Invalid MMIO IRQ configuration."
                 .to_string()
         );
         device_manager