fix: cfg-gate unused imports and Anonymous variant for whp-no-surrogate

Signed-off-by: danbugs <danilochiarlone@gmail.com>

Author: danbugs

src/hyperlight_host/src/hypervisor/virtual_machine/whp.rs

@@ -30,6 +30,7 @@ use windows::Win32::System::LibraryLoader::*;
 use windows::Win32::System::Memory::{MEMORY_MAPPED_VIEW_ADDRESS, UnmapViewOfFile};
 #[cfg(not(feature = "whp-no-surrogate"))]
 use windows::core::s;
+#[cfg(not(feature = "whp-no-surrogate"))]
 use windows_result::HRESULT;
 
 #[cfg(gdb)]

src/hyperlight_host/src/mem/shared_mem.rs

@@ -31,12 +31,13 @@ use windows::Win32::Foundation::{CloseHandle, HANDLE, INVALID_HANDLE_VALUE};
 use windows::Win32::System::Memory::PAGE_READWRITE;
 #[cfg(target_os = "windows")]
 use windows::Win32::System::Memory::{
-    CreateFileMappingA, FILE_MAP_ALL_ACCESS, MEM_PRESERVE_PLACEHOLDER, MEM_RELEASE,
-    MEM_REPLACE_PLACEHOLDER, MEM_RESERVE, MEM_RESERVE_PLACEHOLDER, MEMORY_MAPPED_VIEW_ADDRESS,
-    MapViewOfFile, MapViewOfFile3, PAGE_NOACCESS, PAGE_PROTECTION_FLAGS, PAGE_READONLY,
-    UnmapViewOfFile, VIRTUAL_ALLOCATION_TYPE, VIRTUAL_FREE_TYPE, VirtualAlloc2, VirtualFree,
-    VirtualProtect,
+    CreateFileMappingA, MEM_PRESERVE_PLACEHOLDER, MEM_RELEASE, MEM_REPLACE_PLACEHOLDER,
+    MEM_RESERVE, MEM_RESERVE_PLACEHOLDER, MEMORY_MAPPED_VIEW_ADDRESS, MapViewOfFile3,
+    PAGE_NOACCESS, PAGE_PROTECTION_FLAGS, PAGE_READONLY, UnmapViewOfFile, VIRTUAL_ALLOCATION_TYPE,
+    VIRTUAL_FREE_TYPE, VirtualAlloc2, VirtualFree, VirtualProtect,
 };
+#[cfg(all(target_os = "windows", not(feature = "whp-no-surrogate")))]
+use windows::Win32::System::Memory::{FILE_MAP_ALL_ACCESS, MapViewOfFile};
 #[cfg(all(target_os = "windows", feature = "whp-no-surrogate"))]
 use windows::Win32::System::Memory::{MEM_COMMIT, VirtualAlloc};
 #[cfg(target_os = "windows")]
@@ -117,6 +118,7 @@ enum WindowsMapping {
     /// |<------------------ view ------------------>|
     /// [   guard   ][         blob         ][   guard   ]
     /// ```
+    #[cfg(not(feature = "whp-no-surrogate"))]
     Anonymous {
         view: MappedView,
         file_mapping: FileMapping,
@@ -151,6 +153,7 @@ impl HostMapping {
         }
         #[cfg(target_os = "windows")]
         match &self.mapping {
+            #[cfg(not(feature = "whp-no-surrogate"))]
             WindowsMapping::Anonymous { view, .. } => view.addr as *mut u8,
             WindowsMapping::FileBacked { leading, .. } => leading.addr as *mut u8,
             #[cfg(feature = "whp-no-surrogate")]
@@ -166,6 +169,7 @@ impl HostMapping {
         }
         #[cfg(target_os = "windows")]
         match &self.mapping {
+            #[cfg(not(feature = "whp-no-surrogate"))]
             WindowsMapping::Anonymous { view, .. } => view.len,
             WindowsMapping::FileBacked {
                 leading,
@@ -182,8 +186,9 @@ impl HostMapping {
     #[cfg(target_os = "windows")]
     pub(crate) fn file_mapping_handle(&self) -> HANDLE {
         match &self.mapping {
-            WindowsMapping::Anonymous { file_mapping, .. }
-            | WindowsMapping::FileBacked { file_mapping, .. } => file_mapping.0,
+            #[cfg(not(feature = "whp-no-surrogate"))]
+            WindowsMapping::Anonymous { file_mapping, .. } => file_mapping.0,
+            WindowsMapping::FileBacked { file_mapping, .. } => file_mapping.0,
             #[cfg(feature = "whp-no-surrogate")]
             WindowsMapping::DirectAlloc(_) => INVALID_HANDLE_VALUE,
         }
@@ -1800,6 +1805,7 @@ impl SharedMemory for ReadonlySharedMemory {
     #[cfg(windows)]
     fn host_region_base(&self) -> <HostGuestMemoryRegion as MemoryRegionKind>::HostBaseType {
         match &self.region().mapping {
+            #[cfg(not(feature = "whp-no-surrogate"))]
             WindowsMapping::Anonymous { .. } => super::memory_region::HostRegionBase {
                 from_handle: self.region().file_mapping_handle().into(),
                 handle_base: self.region().ptr() as usize,