clippy

Signed-off-by: Ludvig Liljenberg <[email protected]>

Author: ludfjig

src/hyperlight_host/src/hypervisor/gdb/arch.rs

@@ -17,8 +17,9 @@ limitations under the License.
 //! This file contains architecture specific code for the x86_64
 
 use super::VcpuStopReason;
+use crate::hypervisor::regs::CommonRegisters;
+use crate::hypervisor::vm::Vm;
 use crate::Result;
-use crate::{regs::CommonRegisters, vm::Vm};
 
 // Described in Table 6-1. Exceptions and Interrupts at Page 6-13 Vol. 1
 // of Intel 64 and IA-32 Architectures Software Developer's Manual

src/hyperlight_host/src/hypervisor/gdb/mod.rs

@@ -31,7 +31,7 @@ use gdbstub::target::TargetError;
 use thiserror::Error;
 use x86_64_target::HyperlightSandboxTarget;
 
-use crate::regs::CommonRegisters;
+use crate::hypervisor::regs::CommonRegisters;
 
 #[derive(Debug, Error)]
 pub(crate) enum GdbTargetError {

src/hyperlight_host/src/hypervisor/gdb/x86_64_target.rs

@@ -29,7 +29,7 @@ use gdbstub::target::ext::section_offsets::{Offsets, SectionOffsets};
 use gdbstub::target::{Target, TargetError, TargetResult};
 use gdbstub_arch::x86::X86_64_SSE as GdbTargetArch;
 
-use crate::regs::CommonRegisters;
+use crate::hypervisor::regs::CommonRegisters;
 
 use super::{DebugCommChannel, DebugMsg, DebugResponse, GdbTargetError};
 

src/hyperlight_host/src/hypervisor/hyperlight_vm.rs

@@ -67,7 +67,7 @@ mod debug {
             req: DebugMsg,
             dbg_mem_access_fn: Arc<Mutex<dyn DbgMemAccessHandlerCaller>>,
         ) -> Result<DebugResponse> {
-            if let Some(_) = self.gdb_conn {
+            if self.gdb_conn.is_some() {
                 match req {
                     DebugMsg::AddHwBreakpoint(addr) => Ok(DebugResponse::AddHwBreakpoint(
                         self.vm
@@ -142,7 +142,7 @@ mod debug {
 
                             e
                         })
-                        .map(|regs| DebugResponse::ReadRegisters(regs)),
+                        .map(DebugResponse::ReadRegisters),
                     DebugMsg::RemoveHwBreakpoint(addr) => Ok(DebugResponse::RemoveHwBreakpoint(
                         self.vm
                             .remove_hw_breakpoint(addr)
@@ -364,7 +364,7 @@ impl HyperlightSandbox {
             vm,
             entrypoint,
             orig_rsp: rsp_gp,
-            mem_regions: mem_regions,
+            mem_regions,
 
             #[cfg(gdb)]
             gdb_conn,

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -133,7 +133,7 @@ impl Vm for MshvVm {
     }
 
     fn set_regs(&self, regs: &CommonRegisters) -> Result<()> {
-        let mshv_regs = regs.clone().into();
+        let mshv_regs = (*regs).into();
         Ok(self.vcpu_fd.set_regs(&mshv_regs)?)
     }
 
@@ -143,7 +143,7 @@ impl Vm for MshvVm {
     }
 
     fn set_sregs(&self, sregs: &CommonSpecialRegisters) -> Result<()> {
-        let mshv_sregs = sregs.clone().into();
+        let mshv_sregs = (*sregs).into();
         self.vcpu_fd.set_sregs(&mshv_sregs)?;
         Ok(())
     }
@@ -153,7 +153,7 @@ impl Vm for MshvVm {
     }
 
     fn set_fpu(&self, fpu: &CommonFpu) -> Result<()> {
-        self.vcpu_fd.set_fpu(&fpu.clone().into())?;
+        self.vcpu_fd.set_fpu(&(*fpu).into())?;
         Ok(())
     }
 
@@ -235,7 +235,7 @@ impl Vm for MshvVm {
                     let exception_message = m.to_exception_info()?;
                     let DebugRegisters { dr6, .. } = self.vcpu_fd.get_debug_regs()?;
                     HyperlightExit::Debug {
-                        dr6: dr6,
+                        dr6,
                         exception: exception_message.exception_vector as u32,
                     }
                 }

src/hyperlight_host/src/hypervisor/inprocess.rs

@@ -14,12 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+use crate::hypervisor::DbgMemAccessHandlerCaller;
+use crate::hypervisor::VcpuStopReason;
+use log::LevelFilter;
 use std::fmt::Debug;
 use std::os::raw::c_void;
 use std::sync::{Arc, Mutex};
 
-use log::LevelFilter;
-
 #[cfg(gdb)]
 use super::handlers::DbgMemAccessHandlerWrapper;
 use super::handlers::{MemAccessHandlerCaller, OutBHandlerCaller};
@@ -127,7 +128,7 @@ impl<'a> HyperlightVm for InprocessDriver<'a> {
         _hv_handler: Option<HypervisorHandler>,
         _outb_handle_fn: Arc<Mutex<dyn OutBHandlerCaller>>,
         _mem_access_fn: Arc<Mutex<dyn MemAccessHandlerCaller>>,
-        #[cfg(gdb)] dbg_mem_access_fn: DbgMemAccessHandlerWrapper,
+        #[cfg(gdb)] _dbg_mem_access_fn: DbgMemAccessHandlerWrapper,
     ) -> Result<()> {
         unimplemented!("run should not be needed since we are in in-process mode")
     }
@@ -141,4 +142,14 @@ impl<'a> HyperlightVm for InprocessDriver<'a> {
     fn get_memory_regions(&self) -> &[MemoryRegion] {
         unimplemented!("get_memory_regions is not supported since we are in in-process mode")
     }
+
+    #[cfg(gdb)]
+    /// handles the cases when the vCPU stops due to a Debug event
+    fn handle_debug(
+        &mut self,
+        _dbg_mem_access_fn: Arc<Mutex<dyn DbgMemAccessHandlerCaller>>,
+        _stop_reason: VcpuStopReason,
+    ) -> Result<()> {
+        unimplemented!("handle_debug should not be needed since we are in in-process mode")
+    }
 }

src/hyperlight_host/src/hypervisor/kvm.rs

@@ -98,7 +98,7 @@ impl Vm for KvmVm {
     }
 
     fn set_regs(&self, regs: &CommonRegisters) -> Result<()> {
-        let kvm_regs = regs.clone().into();
+        let kvm_regs = (*regs).into();
         Ok(self.vcpu_fd.set_regs(&kvm_regs)?)
     }
 
@@ -107,15 +107,15 @@ impl Vm for KvmVm {
     }
 
     fn set_sregs(&self, sregs: &CommonSpecialRegisters) -> Result<()> {
-        Ok(self.vcpu_fd.set_sregs(&sregs.clone().into())?)
+        Ok(self.vcpu_fd.set_sregs(&(*sregs).into())?)
     }
 
     fn get_fpu(&self) -> Result<CommonFpu> {
         Ok(self.vcpu_fd.get_fpu()?.into())
     }
 
     fn set_fpu(&self, fpu: &CommonFpu) -> Result<()> {
-        Ok(self.vcpu_fd.set_fpu(&fpu.clone().into())?)
+        Ok(self.vcpu_fd.set_fpu(&(*fpu).into())?)
     }
 
     unsafe fn map_memory(&self, regions: &[MemoryRegion]) -> Result<()> {

src/hyperlight_host/src/hypervisor/regs.rs

@@ -1,7 +1,7 @@
 mod fpu;
-mod regs;
-mod sregs;
+mod special_regs;
+mod standard_regs;
 
 pub(crate) use fpu::*;
-pub(crate) use regs::*;
-pub(crate) use sregs::*;
+pub(crate) use special_regs::*;
+pub(crate) use standard_regs::*;