some reformatting and addressing warnings.

Author: francis-starlab

mythril/src/emulate/cpuid.rs

@@ -32,11 +32,7 @@ fn get_cpu_id_result(
     eax_in: u32,
     ecx_in: u32,
 ) -> CpuIdResult {
-
-    let mut actual = raw_cpuid::native_cpuid::cpuid_count(
-        eax_in,
-        ecx_in,
-    );
+    let mut actual = raw_cpuid::native_cpuid::cpuid_count(eax_in, ecx_in);
 
     match eax_in {
         CPUID_NAME => cpuid_name(vcpu, actual),
@@ -57,27 +53,25 @@ fn get_cpu_id_result(
         EXTENDED_TOPOLOGY_ENUMERATION => {
             todo!("This basically requires APIC stuff to be done.")
         }
-        PROCESSOR_EXTENDED_STATE_ENUMERATION => {
-            actual
-        }
+        PROCESSOR_EXTENDED_STATE_ENUMERATION => actual,
         // There are bunch more leaves after PROCESSOR_EXTENDED_STATE_ENUMERATION, however most of them seem unlikely to be used/ not relevant
         V2_EXTENDED_TOPOLOGY_ENUMERATION => {
             todo!("Requires APIC")
         }
-        0x40000000..=0x4FFFFFFF=> {
+        0x40000000..=0x4FFFFFFF => {
             // these are software reserved.
             actual
         }
-        EXTENDED_FUNCTION_CPUID_INFORMATION => {
-            CpuIdResult{
-                eax: MAX_CPUID_INPUT,
-                ebx: 0,
-                ecx: 0,
-                edx: 0
-            }
-        }
+        EXTENDED_FUNCTION_CPUID_INFORMATION => CpuIdResult {
+            eax: MAX_CPUID_INPUT,
+            ebx: 0,
+            ecx: 0,
+            edx: 0,
+        },
         CPUID_BRAND_STRING_1..=CPUID_BRAND_STRING_3 => {
-            if vcpu.vm.config.override_cpu_name() { todo!("CPU Brand string not implemented yet") }
+            if vcpu.vm.config.override_cpu_name() {
+                todo!("CPU Brand string not implemented yet")
+            }
             actual
         }
         _ => {
@@ -99,7 +93,7 @@ bitfield! {
     max_addressable_ids_physical,set_max_addressable_ids_physical:26,31;
 }
 
-fn intel_cache_topo(mut actual: CpuIdResult) -> CpuIdResult {
+fn intel_cache_topo(actual: CpuIdResult) -> CpuIdResult {
     let mut cache_topo_eax = IntelCoreCacheTopologyEaxRes(actual.eax);
     cache_topo_eax.set_max_addressable_ids_logical(todo!("waiting on apics"));
     cache_topo_eax.set_max_addressable_ids_physical(todo!("waiting on apics"));
@@ -210,15 +204,13 @@ pub fn emulate_cpuid(
 
     //todo move this into get_cpu_id_result
     if guest_cpu.rax as u32 == 1 {
-
         // Hide hypervisor feature
         res.ecx &= !(1 << 31);
 
         // Hide TSC deadline timer
         res.ecx &= !(1 << 24);
     }
 
-
     guest_cpu.rax = res.eax as u64 | (guest_cpu.rax & 0xffffffff00000000);
     guest_cpu.rbx = res.ebx as u64 | (guest_cpu.rbx & 0xffffffff00000000);
     guest_cpu.rcx = res.ecx as u64 | (guest_cpu.rcx & 0xffffffff00000000);

mythril/src/vcpu.rs

@@ -94,7 +94,6 @@ pub struct VCpu {
     pub local_apic: virtdev::lapic::LocalApic,
     pending_interrupts: BTreeMap<u8, InjectedInterruptType>,
     stack: Vec<u8>,
-    vcpu_apic_id: usize,
 }
 
 impl VCpu {
@@ -111,12 +110,11 @@ impl VCpu {
         let stack = vec![0u8; 1024 * 1024];
 
         let mut vcpu = Box::pin(Self {
-            vm: vm,
-            vmcs: vmcs,
+            vm,
+            vmcs,
             local_apic: virtdev::lapic::LocalApic::new(),
-            stack: stack,
+            stack,
             pending_interrupts: BTreeMap::new(),
-            vcpu_apic_id: todo!()
         });
 
         // All VCpus in a VM must share the same address space

mythril/src/vm.rs

@@ -324,7 +324,7 @@ impl VirtualMachineConfig {
             virtual_devices: DeviceMap::default(),
             physical_devices,
             memory,
-            override_cpu_name: todo!()
+            override_cpu_name: todo!(),
         })
     }