got rid of check_vm_instruction related allocations.

Author: francis-starlab

mythril/src/error.rs

@@ -44,7 +44,7 @@ pub enum VmInstructionError {
     InvalidOperandToInveptInvvpid = 28,
 }
 
-pub fn check_vm_insruction(rflags: u64, error: String) -> Result<()> {
+pub fn check_vm_instruction(rflags: u64, error: &str) -> Result<()> {
     let rflags = rflags::RFlags::from_bits_truncate(rflags);
 
     if rflags.contains(RFlags::FLAGS_CF) {

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_insruction(rflags, "Failed to launch vm".into())?;
+        error::check_vm_instruction(rflags, "Failed to launch vm")?;
 
         unreachable!()
     }

mythril/src/vmcs.rs

@@ -333,9 +333,9 @@ fn vmcs_write(field: VmcsField, value: u64) -> Result<()> {
         rflags
     };
 
-    error::check_vm_insruction(
+    error::check_vm_instruction(
         rflags,
-        format!("Failed to write 0x{:x} to field {:?}", value, field),
+        format!("Failed to write 0x{:x} to field {:?}", value, field).as_str(),
     )
 }
 
@@ -369,7 +369,7 @@ fn vmcs_activate(vmcs: &mut Vmcs, _vmx: &vmx::Vmx) -> Result<()> {
         rflags
     };
 
-    error::check_vm_insruction(rflags, "Failed to activate VMCS".into())
+    error::check_vm_instruction(rflags, "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_insruction(rflags, "Failed to clear VMCS".into())
+    error::check_vm_instruction(rflags, "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_insruction(rflags, "Failed to vmresume".into())
+    error::check_vm_instruction(rflags, "Failed to vmresume")
         .expect("vmresume failed");
 }
 

mythril/src/vmx.rs

@@ -52,7 +52,7 @@ impl Vmx {
             rflags
         };
 
-        error::check_vm_insruction(rflags, "Failed to enable vmx".into())?;
+        error::check_vm_instruction(rflags, "Failed to enable vmx")?;
         Ok(Vmx {
             _vmxon_region: vmxon_region,
         })
@@ -70,7 +70,7 @@ impl Vmx {
             rflags
         };
 
-        error::check_vm_insruction(rflags, "Failed to disable vmx".into())
+        error::check_vm_instruction(rflags, "Failed to disable vmx")
     }
 
     pub fn revision() -> u32 {
@@ -90,7 +90,7 @@ impl Vmx {
                       : "m"(val), "r"(t));
             rflags
         };
-        error::check_vm_insruction(rflags, "Failed to execute invept".into())
+        error::check_vm_instruction(rflags, "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_insruction(rflags, "Failed to execute invvpid".into())
+        error::check_vm_instruction(rflags, "Failed to execute invvpid")
     }
 }