removed some dynamic allocations added since this MR was opened.

Author: francis-starlab

mythril/src/error.rs

@@ -84,6 +84,7 @@ pub enum Error {
     InvalidDevice,
     NotImplemented,
     DeviceError,
+    MissingDevice
 }
 
 impl<T: TryFromPrimitive> From<TryFromPrimitiveError<T>> for Error {

mythril/src/vm.rs

@@ -53,7 +53,7 @@ const MAX_IMAGE_MAPPING_PER_VM: usize = 16;
 ///
 /// This method must be called before calling 'virtual_machines'
 pub unsafe fn init_virtual_machines(
-    machines: impl Iterator<Item = VirtualMachine>,
+    machines: impl Iterator<Item=VirtualMachine>,
 ) -> Result<()> {
     for machine in machines {
         VIRTUAL_MACHINE_SET.insert(machine)?;
@@ -114,8 +114,7 @@ impl VirtualMachineSet {
     /// Create a new VirtualMachineSet
     const fn new() -> Self {
         Self {
-            contexts: ArrayVec::<[VirtualMachineContext; MAX_VCPU_COUNT]>::new(
-            ),
+            contexts: ArrayVec::<[VirtualMachineContext; MAX_VCPU_COUNT]>::new(),
             vms: ArrayVec::<[VirtualMachine; MAX_VM_COUNT]>::new(),
         }
     }
@@ -279,7 +278,7 @@ impl VirtualMachineSet {
     }
 
     /// Receive all pending messages for the current core
-    pub fn recv_all_msgs(&self) -> impl Iterator<Item = VirtualMachineMsg> {
+    pub fn recv_all_msgs(&self) -> impl Iterator<Item=VirtualMachineMsg> {
         let context = self
             .context_by_core_id(percore::read_core_id())
             .expect("No VirtualMachineContext for apic id");
@@ -319,7 +318,7 @@ impl StaticVirtualDevices {
 
     fn devices(
         &self,
-    ) -> impl Iterator<Item = &RwLock<dyn virtdev::EmulatedDevice>> {
+    ) -> impl Iterator<Item=&RwLock<dyn virtdev::EmulatedDevice>> {
         core::array::IntoIter::new([
             &self.acpi_runtime as &RwLock<dyn virtdev::EmulatedDevice>,
             &self.vga_controller as &RwLock<dyn virtdev::EmulatedDevice>,
@@ -437,7 +436,7 @@ pub struct VirtualMachine {
 
     /// Portions of the per-core Local APIC state needed for logical addressing
     pub logical_apic_state:
-        BTreeMap<percore::CoreId, virtdev::lapic::LogicalApicState>,
+    BTreeMap<percore::CoreId, virtdev::lapic::LogicalApicState>,
 
     /// The number of vcpus that are up and waiting to start
     cpus_ready: AtomicU32,
@@ -548,9 +547,10 @@ impl VirtualMachine {
                         // Just ignore writes to unknown ports
                         Ok(())
                     }
-                    _ => Err(Error::MissingDevice(
-                        "Unable to dispatch event".into(),
-                    )),
+                    _ => {
+                        error!("Unable to dispatch event");
+                        Err(Error::MissingDevice)
+                    }
                 };
             }
         };
@@ -574,7 +574,7 @@ impl VirtualMachine {
     pub fn logical_apic_destination(
         &self,
         mask: u32,
-    ) -> Result<impl Iterator<Item = &percore::CoreId>> {
+    ) -> Result<impl Iterator<Item=&percore::CoreId>> {
         // FIXME: currently we only support the 'Flat Model' logical mode
         // (so we just ignore the destination format register). See 10.6.2.2
         // of Volume 3A of the Intel software developer's manual
@@ -736,7 +736,7 @@ mod test {
             32,
             host_devices,
         )
-        .unwrap();
+            .unwrap();
 
         VirtualMachine::new(0, config, &info).unwrap();
     }