GOGO

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

Author: ludfjig

src/hyperlight_host/src/hypervisor/hyperlight_vm.rs

@@ -27,10 +27,10 @@ use super::handlers::DbgMemAccessHandlerWrapper;
 use super::handlers::{
     MemAccessHandlerCaller, MemAccessHandlerWrapper, OutBHandlerCaller, OutBHandlerWrapper,
 };
-#[cfg(mshv)]
-use super::hyperv_linux::MshvVm;
 #[cfg(kvm)]
 use super::kvm::KvmVm;
+#[cfg(mshv)]
+use super::mshv::MshvVm;
 use super::regs::{
     CommonFpu, CommonRegisters, FP_CONTROL_WORD_DEFAULT, FP_TAG_WORD_DEFAULT, MXCSR_DEFAULT,
 };
@@ -41,10 +41,10 @@ use super::{
 };
 #[cfg(crashdump)]
 use crate::hypervisor::crashdump;
-#[cfg(target_os = "windows")]
-use crate::hypervisor::hyperv_windows::WhpVm;
 use crate::hypervisor::hypervisor_handler::HypervisorHandler;
 #[cfg(target_os = "windows")]
+use crate::hypervisor::whp::WhpVm;
+#[cfg(target_os = "windows")]
 use crate::hypervisor::wrappers::HandleWrapper;
 use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
 use crate::mem::ptr::{GuestPtr, RawPtr};

src/hyperlight_host/src/hypervisor/mod.rs

@@ -21,15 +21,15 @@ use crate::Result;
 /// Handlers for Hypervisor custom logic
 pub mod handlers;
 pub(crate) mod hyperlight_vm;
+pub(crate) mod hypervisor_handler;
 /// HyperV-on-linux functionality
 #[cfg(mshv)]
-pub mod hyperv_linux;
-#[cfg(target_os = "windows")]
-/// Hyperv-on-windows functionality
-pub(crate) mod hyperv_windows;
-pub(crate) mod hypervisor_handler;
+pub mod mshv;
 mod regs;
 mod vm;
+#[cfg(target_os = "windows")]
+/// Hyperv-on-windows functionality
+pub(crate) mod whp;
 
 /// GDB debugging support
 #[cfg(gdb)]

src/hyperlight_host/src/hypervisor/hyperv_linux.rs renamed to src/hyperlight_host/src/hypervisor/mshv.rs

@@ -127,8 +127,7 @@ impl WhpVm {
                 register_names.as_ptr(),
                 register_count as u32,
                 register_values.as_ptr(),
-            )
-            .unwrap();
+            )?;
         }
 
         Ok(())
@@ -147,8 +146,7 @@ impl Vm for WhpVm {
                 WHP_REGS_NAMES.as_ptr(),
                 WHP_REGS_NAMES_LEN as u32,
                 whv_regs_values.as_mut_ptr(),
-            )
-            .unwrap();
+            )?;
         }
 
         WHP_REGS_NAMES
@@ -182,8 +180,7 @@ impl Vm for WhpVm {
                 WHP_SREGS_NAMES.as_ptr(),
                 whp_sregs_values.len() as u32,
                 whp_sregs_values.as_mut_ptr(),
-            )
-            .unwrap();
+            )?;
         }
 
         WHP_SREGS_NAMES
@@ -217,8 +214,7 @@ impl Vm for WhpVm {
                 WHP_FPU_NAMES.as_ptr(),
                 whp_fpu_values.len() as u32,
                 whp_fpu_values.as_mut_ptr(),
-            )
-            .unwrap();
+            )?;
         }
 
         WHP_FPU_NAMES

src/hyperlight_host/src/hypervisor/hyperv_windows.rs renamed to src/hyperlight_host/src/hypervisor/whp.rs

@@ -17,12 +17,12 @@ limitations under the License.
 use std::fmt::Debug;
 use std::sync::OnceLock;
 
-#[cfg(mshv)]
-use crate::hypervisor::hyperv_linux;
-#[cfg(target_os = "windows")]
-use crate::hypervisor::hyperv_windows;
 #[cfg(kvm)]
 use crate::hypervisor::kvm;
+#[cfg(mshv)]
+use crate::hypervisor::mshv;
+#[cfg(target_os = "windows")]
+use crate::hypervisor::whp;
 
 static AVAILABLE_HYPERVISOR: OnceLock<Option<HypervisorType>> = OnceLock::new();
 
@@ -33,7 +33,7 @@ pub fn get_available_hypervisor() -> &'static Option<HypervisorType> {
                 // If both features are enabled, we need to determine hypervisor at runtime.
                 // Currently /dev/kvm and /dev/mshv cannot exist on the same machine, so the first one
                 // that works is guaranteed to be correct.
-                if hyperv_linux::is_hypervisor_present() {
+                if mshv::is_hypervisor_present() {
                     Some(HypervisorType::Mshv)
                 } else if kvm::is_hypervisor_present() {
                     Some(HypervisorType::Kvm)
@@ -47,13 +47,13 @@ pub fn get_available_hypervisor() -> &'static Option<HypervisorType> {
                     None
                 }
             } else if #[cfg(mshv)] {
-                if hyperv_linux::is_hypervisor_present() {
+                if mshv::is_hypervisor_present() {
                     Some(HypervisorType::Mshv)
                 } else {
                     None
                 }
             } else if #[cfg(target_os = "windows")] {
-                if hyperv_windows::is_hypervisor_present() {
+                if whp::is_hypervisor_present() {
                     Some(HypervisorType::Whp)
                 } else {
                     None