got rid of one last format!

Author: francis-starlab

mythril/src/acpi/madt.rs

@@ -16,7 +16,6 @@ use num_enum::TryFromPrimitive;
 /// SDT (the end of the Creator Revision at offset 36).
 mod offsets {
     use super::*;
-
     /// 32-bit physical address at which each processor can access its
     /// local APIC.
     pub const LOCAL_INT_CTRL_ADDR: Range<usize> = 0..4;

mythril/src/error.rs

@@ -43,11 +43,11 @@ pub enum VmInstructionError {
     InvalidOperandToInveptInvvpid = 28,
 }
 
-pub fn check_vm_instruction(rflags: u64, error: &str) -> Result<()> {
+pub fn check_vm_instruction(rflags: u64, log_error: impl Fn()) -> Result<()> {
     let rflags = rflags::RFlags::from_bits_truncate(rflags);
 
     if rflags.contains(RFlags::FLAGS_CF) {
-        error!("{}", error);
+        log_error();
         Err(Error::VmFailInvalid)
     } else if rflags.contains(RFlags::FLAGS_ZF) {
         let errno = unsafe {
@@ -63,7 +63,7 @@ pub fn check_vm_instruction(rflags: u64, error: &str) -> Result<()> {
             .unwrap_or(VmInstructionError::UnknownError);
 
         error!("{:?}", vm_error);
-        error!("{}", error);
+        log_error();
         Err(Error::VmFailValid)
     } else {
         Ok(())

mythril/src/vcpu.rs

@@ -171,7 +171,7 @@ impl VCpu {
     /// Begin execution in the guest context for this core
     pub fn launch(&mut self) -> Result<!> {
         let rflags = unsafe { vmlaunch_wrapper() };
-        error::check_vm_instruction(rflags, "Failed to launch vm")?;
+        error::check_vm_instruction(rflags, ||error!("Failed to launch vm"))?;
 
         unreachable!()
     }

mythril/src/vmcs.rs

@@ -335,7 +335,7 @@ fn vmcs_write(field: VmcsField, value: u64) -> Result<()> {
 
     error::check_vm_instruction(
         rflags,
-        format!("Failed to write 0x{:x} to field {:?}", value, field).as_str(),
+        ||error!("Failed to write 0x{:x} to field {:?}", value, field),
     )
 }
 
@@ -369,7 +369,7 @@ fn vmcs_activate(vmcs: &mut Vmcs, _vmx: &vmx::Vmx) -> Result<()> {
         rflags
     };
 
-    error::check_vm_instruction(rflags, "Failed to activate VMCS")
+    error::check_vm_instruction(rflags, ||error!("Failed to activate VMCS"))
 }
 
 fn vmcs_clear(vmcs_page: &mut Raw4kPage) -> Result<()> {
@@ -382,7 +382,7 @@ fn vmcs_clear(vmcs_page: &mut Raw4kPage) -> Result<()> {
                   : "volatile");
         rflags
     };
-    error::check_vm_instruction(rflags, "Failed to clear VMCS")
+    error::check_vm_instruction(rflags, ||error!("Failed to clear VMCS"))
 }
 
 pub struct Vmcs {

mythril/src/vmexit.rs

@@ -54,7 +54,7 @@ pub extern "C" fn vmexit_handler(state: *mut GuestCpuState) {
 
 #[no_mangle]
 pub extern "C" fn vmresume_failure_handler(rflags: u64) {
-    error::check_vm_instruction(rflags, "Failed to vmresume")
+    error::check_vm_instruction(rflags,|| error!("Failed to vmresume"))
         .expect("vmresume failed");
 }
 

mythril/src/vmx.rs

@@ -52,7 +52,7 @@ impl Vmx {
             rflags
         };
 
-        error::check_vm_instruction(rflags, "Failed to enable vmx")?;
+        error::check_vm_instruction(rflags, ||error!("Failed to enable vmx"))?;
         Ok(Vmx {
             _vmxon_region: vmxon_region,
         })
@@ -70,7 +70,7 @@ impl Vmx {
             rflags
         };
 
-        error::check_vm_instruction(rflags, "Failed to disable vmx")
+        error::check_vm_instruction(rflags, ||error!("Failed to disable vmx"))
     }
 
     pub fn revision() -> u32 {
@@ -90,7 +90,7 @@ impl Vmx {
                       : "m"(val), "r"(t));
             rflags
         };
-        error::check_vm_instruction(rflags, "Failed to execute invept")
+        error::check_vm_instruction(rflags, ||error!("Failed to execute invept"))
     }
 
     pub fn invvpid(&self, mode: InvVpidMode) -> Result<()> {
@@ -112,7 +112,7 @@ impl Vmx {
                       : "m"(val), "r"(t));
             rflags
         };
-        error::check_vm_instruction(rflags, "Failed to execute invvpid")
+        error::check_vm_instruction(rflags, ||error!("Failed to execute invvpid"))
     }
 }