Fix tests for static allocations

Author: ALSchwalm

mythril/src/virtdev/mod.rs

@@ -497,10 +497,8 @@ mod test {
     }
 
     impl DummyDevice {
-        fn new(
-            services: Vec<RangeInclusive<Port>>,
-        ) -> Arc<RwLock<dyn EmulatedDevice>> {
-            Arc::new(RwLock::new(Self { services }))
+        fn new(services: Vec<RangeInclusive<Port>>) -> Self {
+            Self { services }
         }
     }
 
@@ -516,8 +514,8 @@ mod test {
     #[test]
     fn test_device_map() {
         let mut map = DeviceMap::default();
-        let com = Uart8250::new(0);
-        map.register_device(com).unwrap();
+        let com = RwLock::new(Uart8250::new(0).unwrap());
+        map.register_device(&com).unwrap();
         let _dev = map.find_device(0u16).unwrap();
 
         assert_eq!(map.find_device(10u16).is_none(), true);
@@ -552,62 +550,62 @@ mod test {
     #[test]
     fn test_conflicting_portio_device() {
         let mut map = DeviceMap::default();
-        let com = Uart8250::new(0);
-        map.register_device(com).unwrap();
-        let com = Uart8250::new(0);
+        let com = RwLock::new(Uart8250::new(0).unwrap());
+        map.register_device(&com).unwrap();
+        let com = RwLock::new(Uart8250::new(0).unwrap());
 
-        assert!(map.register_device(com).is_err());
+        assert!(map.register_device(&com).is_err());
     }
 
     #[test]
     fn test_fully_overlapping_portio_device() {
         // region 2 fully inside region 1
         let services = vec![0..=10, 2..=8];
-        let dummy = DummyDevice::new(services);
+        let dummy = RwLock::new(DummyDevice::new(services));
         let mut map = DeviceMap::default();
 
-        assert!(map.register_device(dummy).is_err());
+        assert!(map.register_device(&dummy).is_err());
     }
 
     #[test]
     fn test_fully_encompassing_portio_device() {
         // region 1 fully inside region 2
         let services = vec![2..=8, 0..=10];
-        let dummy = DummyDevice::new(services);
+        let dummy = RwLock::new(DummyDevice::new(services));
         let mut map = DeviceMap::default();
 
-        assert!(map.register_device(dummy).is_err());
+        assert!(map.register_device(&dummy).is_err());
     }
 
     #[test]
     fn test_partially_overlapping_tail_portio_device() {
         // region 1 and region 2 partially overlap at the tail of region 1 and
         // the start of region 2
         let services = vec![0..=4, 3..=8];
-        let dummy = DummyDevice::new(services);
+        let dummy = RwLock::new(DummyDevice::new(services));
         let mut map = DeviceMap::default();
 
-        assert!(map.register_device(dummy).is_err());
+        assert!(map.register_device(&dummy).is_err());
     }
 
     #[test]
     fn test_partially_overlapping_head_portio_device() {
         // region 1 and region 2 partially overlap at the start of region 1 and
         // the tail of region 2
         let services = vec![3..=8, 0..=4];
-        let dummy = DummyDevice::new(services);
+        let dummy = RwLock::new(DummyDevice::new(services));
         let mut map = DeviceMap::default();
 
-        assert!(map.register_device(dummy).is_err());
+        assert!(map.register_device(&dummy).is_err());
     }
 
     #[test]
     fn test_non_overlapping_portio_device() {
         // region 1 and region 2 don't overlap
         let services = vec![0..=3, 4..=8];
-        let dummy = DummyDevice::new(services);
+        let dummy = RwLock::new(DummyDevice::new(services));
         let mut map = DeviceMap::default();
 
-        assert!(map.register_device(dummy).is_ok());
+        assert!(map.register_device(&dummy).is_ok());
     }
 }

mythril/src/virtdev/pci.rs

@@ -275,7 +275,7 @@ mod test {
 
     fn complex_ready_for_reg_read(reg: u8) -> PciRootComplex {
         let view = define_test_view();
-        let complex = PciRootComplex::new().unwrap();
+        let mut complex = PciRootComplex::new().unwrap();
         let addr = ((reg << 2) as u32).to_be_bytes();
         let request = PortWriteRequest::try_from(&addr[..]).unwrap();
         let mut responses = ResponseEventArray::default();
@@ -292,11 +292,10 @@ mod test {
     #[test]
     fn test_full_register_read() {
         let view = define_test_view();
-        let complex = complex_ready_for_reg_read(0);
+        let mut complex = complex_ready_for_reg_read(0);
         let mut buff = [0u8; 4];
         let val = PortReadRequest::FourBytes(&mut buff);
         let mut responses = ResponseEventArray::default();
-        let mut complex = complex.write();
         let event = Event::new(
             DeviceEvent::PortRead(PciRootComplex::PCI_CONFIG_DATA, val),
             view,
@@ -311,11 +310,10 @@ mod test {
     #[test]
     fn test_half_register_read() {
         let view = define_test_view();
-        let complex = complex_ready_for_reg_read(0);
+        let mut complex = complex_ready_for_reg_read(0);
         let mut buff = [0u8; 2];
         let val = PortReadRequest::TwoBytes(&mut buff);
         let mut responses = ResponseEventArray::default();
-        let mut complex = complex.write();
         let event = Event::new(
             DeviceEvent::PortRead(PciRootComplex::PCI_CONFIG_DATA, val),
             view,
@@ -339,10 +337,9 @@ mod test {
 
     #[test]
     fn test_register_byte_read() {
-        let complex = complex_ready_for_reg_read(0);
+        let mut complex = complex_ready_for_reg_read(0);
         let mut buff = [0u8; 1];
         let mut responses = ResponseEventArray::default();
-        let mut complex = complex.write();
 
         let view = define_test_view();
         let val = PortReadRequest::OneByte(&mut buff);

mythril/src/vm.rs

@@ -709,14 +709,15 @@ mod test {
     #[test]
     fn test_vm_creation() {
         let info = BootInfo::default();
-        let phys_config = PhysicalDeviceConfig::default();
+        let host_devices = HostPhysicalDevices::default();
 
         let config = VirtualMachineConfig::new(
             &[percore::CoreId::from(1)],
-            0,
-            phys_config,
+            32,
+            host_devices,
         )
         .unwrap();
+
         VirtualMachine::new(0, config, &info).unwrap();
     }
 }