Remove DbgMemAccessHandlerCaller trait and DbgMemAccessHandlerWrapper abstractions

Co-authored-by: simongdavies <[email protected]>

Author: Copilot

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

@@ -47,8 +47,8 @@ use x86_64_target::HyperlightSandboxTarget;
 
 use super::InterruptHandle;
 use crate::mem::layout::SandboxMemoryLayout;
-use crate::sandbox::mem_mgr::MemMgrWrapper;
 use crate::mem::shared_mem::HostSharedMemory;
+use crate::sandbox::mem_mgr::MemMgrWrapper;
 use crate::{HyperlightError, new_error};
 
 #[derive(Debug, Error)]

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -65,8 +65,6 @@ use super::fpu::{FP_CONTROL_WORD_DEFAULT, FP_TAG_WORD_DEFAULT, MXCSR_DEFAULT};
 use super::gdb::{
     DebugCommChannel, DebugMsg, DebugResponse, GuestDebug, MshvDebug, VcpuStopReason,
 };
-use crate::sandbox::mem_mgr::MemMgrWrapper;
-use crate::mem::shared_mem::HostSharedMemory;
 #[cfg(feature = "init-paging")]
 use super::{
     CR0_AM, CR0_ET, CR0_MP, CR0_NE, CR0_PE, CR0_PG, CR0_WP, CR4_OSFXSR, CR4_OSXMMEXCPT, CR4_PAE,
@@ -78,10 +76,12 @@ use crate::HyperlightError;
 use crate::hypervisor::get_memory_access_violation;
 use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
 use crate::mem::ptr::{GuestPtr, RawPtr};
+use crate::mem::shared_mem::HostSharedMemory;
 use crate::sandbox::SandboxConfiguration;
 #[cfg(feature = "trace_guest")]
 use crate::sandbox::TraceInfo;
 use crate::sandbox::host_funcs::FunctionRegistry;
+use crate::sandbox::mem_mgr::MemMgrWrapper;
 use crate::sandbox::outb::handle_outb;
 #[cfg(crashdump)]
 use crate::sandbox::uninitialized::SandboxRuntimeConfig;
@@ -94,8 +94,8 @@ mod debug {
     use super::mshv_bindings::hv_x64_exception_intercept_message;
     use super::{HypervLinuxDriver, *};
     use crate::hypervisor::gdb::{DebugMsg, DebugResponse, VcpuStopReason, X86_64Regs};
-    use crate::sandbox::mem_mgr::MemMgrWrapper;
     use crate::mem::shared_mem::HostSharedMemory;
+    use crate::sandbox::mem_mgr::MemMgrWrapper;
     use crate::{Result, new_error};
 
     impl HypervLinuxDriver {

src/hyperlight_host/src/hypervisor/hyperv_windows.rs

@@ -39,8 +39,8 @@ use {
         DebugCommChannel, DebugMsg, DebugResponse, GuestDebug, HypervDebug, VcpuStopReason,
     },
     crate::HyperlightError,
-    crate::sandbox::mem_mgr::MemMgrWrapper,
     crate::mem::shared_mem::HostSharedMemory,
+    crate::sandbox::mem_mgr::MemMgrWrapper,
 };
 
 #[cfg(feature = "trace_guest")]
@@ -80,8 +80,8 @@ mod debug {
     use super::{HypervWindowsDriver, *};
     use crate::Result;
     use crate::hypervisor::gdb::{DebugMsg, DebugResponse, VcpuStopReason, X86_64Regs};
-    use crate::sandbox::mem_mgr::MemMgrWrapper;
     use crate::mem::shared_mem::HostSharedMemory;
+    use crate::sandbox::mem_mgr::MemMgrWrapper;
 
     impl HypervWindowsDriver {
         /// Resets the debug information to disable debugging

src/hyperlight_host/src/hypervisor/kvm.rs

@@ -32,8 +32,6 @@ use super::TraceRegister;
 use super::fpu::{FP_CONTROL_WORD_DEFAULT, FP_TAG_WORD_DEFAULT, MXCSR_DEFAULT};
 #[cfg(gdb)]
 use super::gdb::{DebugCommChannel, DebugMsg, DebugResponse, GuestDebug, KvmDebug, VcpuStopReason};
-use crate::sandbox::mem_mgr::MemMgrWrapper;
-use crate::mem::shared_mem::HostSharedMemory;
 #[cfg(feature = "init-paging")]
 use super::{
     CR0_AM, CR0_ET, CR0_MP, CR0_NE, CR0_PE, CR0_PG, CR0_WP, CR4_OSFXSR, CR4_OSXMMEXCPT, CR4_PAE,
@@ -45,10 +43,12 @@ use crate::HyperlightError;
 use crate::hypervisor::get_memory_access_violation;
 use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
 use crate::mem::ptr::{GuestPtr, RawPtr};
+use crate::mem::shared_mem::HostSharedMemory;
 use crate::sandbox::SandboxConfiguration;
 #[cfg(feature = "trace_guest")]
 use crate::sandbox::TraceInfo;
 use crate::sandbox::host_funcs::FunctionRegistry;
+use crate::sandbox::mem_mgr::MemMgrWrapper;
 use crate::sandbox::outb::handle_outb;
 #[cfg(crashdump)]
 use crate::sandbox::uninitialized::SandboxRuntimeConfig;
@@ -86,8 +86,8 @@ mod debug {
     use crate::hypervisor::gdb::{
         DebugMsg, DebugResponse, GuestDebug, KvmDebug, VcpuStopReason, X86_64Regs,
     };
-    use crate::sandbox::mem_mgr::MemMgrWrapper;
     use crate::mem::shared_mem::HostSharedMemory;
+    use crate::sandbox::mem_mgr::MemMgrWrapper;
     use crate::{Result, new_error};
 
     impl KVMDriver {

src/hyperlight_host/src/sandbox/initialized_multi_use.rs

@@ -37,14 +37,14 @@ use super::{Callable, WrapperGetter};
 use crate::HyperlightError::SnapshotSandboxMismatch;
 use crate::func::guest_err::check_for_guest_error;
 use crate::func::{ParameterTuple, SupportedReturnType};
-use crate::sandbox::mem_mgr::MemMgrWrapper;
-use crate::mem::shared_mem::HostSharedMemory;
 use crate::hypervisor::{Hypervisor, InterruptHandle};
 #[cfg(unix)]
 use crate::mem::memory_region::MemoryRegionType;
 use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
 use crate::mem::ptr::RawPtr;
+use crate::mem::shared_mem::HostSharedMemory;
 use crate::metrics::maybe_time_and_emit_guest_call;
+use crate::sandbox::mem_mgr::MemMgrWrapper;
 use crate::{Result, log_then_return};
 
 /// Global counter for assigning unique IDs to sandboxes

src/hyperlight_host/src/sandbox/mem_access.rs

@@ -28,5 +28,3 @@ pub(crate) fn handle_mem_access(hv: &dyn Hypervisor) -> Result<()> {
 
     Ok(())
 }
-
-

src/hyperlight_host/src/sandbox/uninitialized_evolve.rs

@@ -21,7 +21,6 @@ use tracing::{Span, instrument};
 
 use super::SandboxConfiguration;
 use super::hypervisor::{HypervisorType, get_available_hypervisor};
-
 #[cfg(any(crashdump, gdb))]
 use super::uninitialized::SandboxRuntimeConfig;
 use crate::HyperlightError::NoHypervisorFound;