fixup! Add InterruptHandle trait, and implement trait for mshv,kvm and windows

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

Author: ludfjig

src/hyperlight_host/src/hypervisor/hyperv_windows.rs

@@ -36,12 +36,13 @@ use super::fpu::{FP_TAG_WORD_DEFAULT, MXCSR_DEFAULT};
 use super::handlers::DbgMemAccessHandlerWrapper;
 use super::handlers::{MemAccessHandlerWrapper, OutBHandlerWrapper};
 use super::surrogate_process::SurrogateProcess;
+use super::surrogate_process_manager::*;
 use super::windows_hypervisor_platform::{VMPartition, VMProcessor};
 use super::wrappers::{HandleWrapper, WHvFPURegisters};
-use super::{surrogate_process_manager::*, InterruptHandle};
 use super::{
-    HyperlightExit, Hypervisor, VirtualCPU, CR0_AM, CR0_ET, CR0_MP, CR0_NE, CR0_PE, CR0_PG, CR0_WP,
-    CR4_OSFXSR, CR4_OSXMMEXCPT, CR4_PAE, EFER_LMA, EFER_LME, EFER_NX, EFER_SCE,
+    HyperlightExit, Hypervisor, InterruptHandle, VirtualCPU, CR0_AM, CR0_ET, CR0_MP, CR0_NE,
+    CR0_PE, CR0_PG, CR0_WP, CR4_OSFXSR, CR4_OSXMMEXCPT, CR4_PAE, EFER_LMA, EFER_LME, EFER_NX,
+    EFER_SCE,
 };
 use crate::hypervisor::fpu::FP_CONTROL_WORD_DEFAULT;
 use crate::hypervisor::wrappers::WHvGeneralRegisters;
@@ -108,7 +109,7 @@ impl HypervWindowsDriver {
             mem_regions,
             interrupt_handle: Arc::new(WindowsInterruptHandle {
                 running: AtomicBool::new(false),
-                parition_handle: partition_handle,
+                partition_handle: partition_handle,
                 dropped: AtomicBool::new(false),
             }),
         })
@@ -509,14 +510,14 @@ impl Drop for HypervWindowsDriver {
 pub struct WindowsInterruptHandle {
     // `WHvCancelRunVirtualProcessor()` will return Ok even if the vcpu is not running, which is the reason we need this flag.
     running: AtomicBool,
-    parition_handle: WHV_PARTITION_HANDLE,
+    partition_handle: WHV_PARTITION_HANDLE,
     dropped: AtomicBool,
 }
 
 impl InterruptHandle for WindowsInterruptHandle {
     fn kill(&self) -> bool {
         self.running.load(Ordering::Relaxed)
-            && unsafe { WHvCancelRunVirtualProcessor(self.parition_handle, 0, 0).is_ok() }
+            && unsafe { WHvCancelRunVirtualProcessor(self.partition_handle, 0, 0).is_ok() }
     }
 
     fn dropped(&self) -> bool {

src/hyperlight_host/src/sandbox/uninitialized_evolve.rs

@@ -14,11 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-use crate::hypervisor::handlers::{MemAccessHandlerCaller, OutBHandlerCaller};
-use crate::hypervisor::Hypervisor;
-#[cfg(target_os = "linux")]
-use crate::signal_handlers::setup_signal_handlers;
-use crate::HyperlightError::NoHypervisorFound;
 use std::sync::{Arc, Mutex};
 
 use rand::Rng;
@@ -27,6 +22,8 @@ use tracing::{instrument, Span};
 use super::hypervisor::{get_available_hypervisor, HypervisorType};
 #[cfg(gdb)]
 use super::mem_access::dbg_mem_access_handler_wrapper;
+use crate::hypervisor::handlers::{MemAccessHandlerCaller, OutBHandlerCaller};
+use crate::hypervisor::Hypervisor;
 use crate::mem::layout::SandboxMemoryLayout;
 use crate::mem::mgr::SandboxMemoryManager;
 use crate::mem::ptr::{GuestPtr, RawPtr};
@@ -39,6 +36,9 @@ use crate::sandbox::mem_access::mem_access_handler_wrapper;
 use crate::sandbox::outb::outb_handler_wrapper;
 use crate::sandbox::{HostSharedMemory, MemMgrWrapper};
 use crate::sandbox_state::sandbox::Sandbox;
+#[cfg(target_os = "linux")]
+use crate::signal_handlers::setup_signal_handlers;
+use crate::HyperlightError::NoHypervisorFound;
 use crate::{log_then_return, new_error, MultiUseSandbox, Result, UninitializedSandbox};
 
 /// The implementation for evolving `UninitializedSandbox`es to
@@ -227,9 +227,10 @@ fn set_up_hypervisor_partition(
 
         #[cfg(target_os = "windows")]
         Some(HypervisorType::Whp) => {
-            use crate::hypervisor::wrappers::HandleWrapper;
             use std::ffi::c_void;
 
+            use crate::hypervisor::wrappers::HandleWrapper;
+
             let mmap_file_handle = mgr
                 .shared_mem
                 .with_exclusivity(|e| e.get_mmap_file_handle())?;