Fix hypervisor handle caching implementation

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

Author: Copilot

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -273,18 +273,24 @@ mod debug {
 }
 
 /// Static global MSHV handle to avoid reopening /dev/mshv for every sandbox
-static MSHV_HANDLE: OnceLock<Option<Mshv>> = OnceLock::new();
+static MSHV_HANDLE: OnceLock<Mshv> = OnceLock::new();
 
 /// Get the global MSHV handle, initializing it if needed
 #[instrument(skip_all, parent = Span::current(), level = "Trace")]
-pub(crate) fn get_mshv_handle() -> &'static Option<Mshv> {
-    MSHV_HANDLE.get_or_init(|| match Mshv::new() {
-        Ok(mshv) => Some(mshv),
-        Err(e) => {
-            log::info!("MSHV is not available on this system: {}", e);
-            None
-        }
-    })
+pub(crate) fn get_mshv_handle() -> Option<&'static Mshv> {
+    match MSHV_HANDLE.get() {
+        Some(mshv) => Some(mshv),
+        None => match Mshv::new() {
+            Ok(mshv) => {
+                let _ = MSHV_HANDLE.set(mshv);
+                MSHV_HANDLE.get()
+            }
+            Err(e) => {
+                log::info!("MSHV is not available on this system: {}", e);
+                None
+            }
+        },
+    }
 }
 
 /// Determine whether the HyperV for Linux hypervisor API is present
@@ -297,7 +303,7 @@ pub(crate) fn is_hypervisor_present() -> bool {
 /// A Hypervisor driver for HyperV-on-Linux. This hypervisor is often
 /// called the Microsoft Hypervisor (MSHV)
 pub(super) struct HypervLinuxDriver {
-    _mshv: Mshv,
+    _mshv: &'static Mshv,
     vm_fd: VmFd,
     vcpu_fd: VcpuFd,
     entrypoint: u64,
@@ -328,7 +334,7 @@ impl HypervLinuxDriver {
         #[cfg(gdb)] gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
     ) -> Result<Self> {
         let mshv = match get_mshv_handle() {
-            Some(mshv) => mshv.clone(),
+            Some(mshv) => mshv,
             None => return Err(new_error!("MSHV is not available on this system")),
         };
 

src/hyperlight_host/src/hypervisor/kvm.rs

@@ -44,31 +44,37 @@ use crate::HyperlightError;
 use crate::{log_then_return, new_error, Result};
 
 /// Static global KVM handle to avoid reopening /dev/kvm for every sandbox
-static KVM_HANDLE: OnceLock<Option<Kvm>> = OnceLock::new();
+static KVM_HANDLE: OnceLock<Kvm> = OnceLock::new();
 
 /// Get the global KVM handle, initializing it if needed
 #[instrument(skip_all, parent = Span::current(), level = "Trace")]
-pub(crate) fn get_kvm_handle() -> &'static Option<Kvm> {
-    KVM_HANDLE.get_or_init(|| match Kvm::new() {
-        Ok(kvm) => {
-            let api_version = kvm.get_api_version();
-            match api_version {
-                version if version == 12 && kvm.check_extension(UserMemory) => Some(kvm),
-                12 => {
-                    log::info!("KVM does not have KVM_CAP_USER_MEMORY capability");
-                    None
-                }
-                version => {
-                    log::info!("KVM GET_API_VERSION returned {}, expected 12", version);
-                    None
+pub(crate) fn get_kvm_handle() -> Option<&'static Kvm> {
+    match KVM_HANDLE.get() {
+        Some(kvm) => Some(kvm),
+        None => match Kvm::new() {
+            Ok(kvm) => {
+                let api_version = kvm.get_api_version();
+                match api_version {
+                    version if version == 12 && kvm.check_extension(UserMemory) => {
+                        let _ = KVM_HANDLE.set(kvm);
+                        KVM_HANDLE.get()
+                    }
+                    12 => {
+                        log::info!("KVM does not have KVM_CAP_USER_MEMORY capability");
+                        None
+                    }
+                    version => {
+                        log::info!("KVM GET_API_VERSION returned {}, expected 12", version);
+                        None
+                    }
                 }
             }
-        }
-        Err(e) => {
-            log::info!("KVM is not available on this system: {}", e);
-            None
-        }
-    })
+            Err(e) => {
+                log::info!("KVM is not available on this system: {}", e);
+                None
+            }
+        },
+    }
 }
 
 /// Return `true` if the KVM API is available, version 12, and has UserMemory capability, or `false` otherwise
@@ -288,7 +294,7 @@ mod debug {
 
 /// A Hypervisor driver for KVM on Linux
 pub(super) struct KVMDriver {
-    _kvm: Kvm,
+    _kvm: &'static Kvm,
     _vm_fd: VmFd,
     vcpu_fd: VcpuFd,
     entrypoint: u64,
@@ -314,7 +320,7 @@ impl KVMDriver {
         #[cfg(gdb)] gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
     ) -> Result<Self> {
         let kvm = match get_kvm_handle() {
-            Some(kvm) => kvm.clone(),
+            Some(kvm) => kvm,
             None => return Err(new_error!("KVM is not available on this system")),
         };