fix: replace all the remaining nanvix-unstable with i686-guest

Signed-off-by: Tomasz Andrzejak <andreiltd@gmail.com>

Author: andreiltd

src/hyperlight_common/src/mem.rs

@@ -77,6 +77,6 @@ pub struct HyperlightPEB {
     /// [`FileMappingInfo`] entries), NOT a byte size. `ptr` holds the
     /// guest address of the preallocated array (immediately after the
     /// PEB struct).
-    #[cfg(feature = "nanvix-unstable")]
+    #[cfg(feature = "i686-guest")]
     pub file_mappings: GuestMemoryRegion,
 }

src/hyperlight_host/build.rs

@@ -105,8 +105,8 @@ fn main() -> Result<()> {
         crashdump: { all(feature = "crashdump", target_arch = "x86_64") },
         // print_debug feature is aliased with debug_assertions to make it only available in debug-builds.
         print_debug: { all(feature = "print_debug", debug_assertions) },
-        // gdb needs writable snapshot memory for debug access.
-        unshared_snapshot_mem: { feature = "gdb" },
+        // gdb and i686-guest need writable snapshot memory.
+        unshared_snapshot_mem: { any(feature = "gdb", feature = "i686-guest") },
     }
 
     #[cfg(feature = "build-metadata")]

src/hyperlight_host/src/mem/elf.rs

@@ -22,9 +22,9 @@ use goblin::elf::reloc::{R_AARCH64_NONE, R_AARCH64_RELATIVE};
 #[cfg(target_arch = "x86_64")]
 use goblin::elf::reloc::{R_X86_64_NONE, R_X86_64_RELATIVE};
 use goblin::elf::{Elf, ProgramHeaders, Reloc};
-#[cfg(feature = "nanvix-unstable")]
+#[cfg(feature = "i686-guest")]
 use goblin::elf32::program_header::PT_LOAD;
-#[cfg(not(feature = "nanvix-unstable"))]
+#[cfg(not(feature = "i686-guest"))]
 use goblin::elf64::program_header::PT_LOAD;
 
 use super::exe::LoadInfo;

src/hyperlight_host/src/mem/layout.rs

@@ -227,7 +227,7 @@ pub(crate) struct SandboxMemoryLayout {
     peb_output_data_offset: usize,
     peb_init_data_offset: usize,
     peb_heap_data_offset: usize,
-    #[cfg(feature = "nanvix-unstable")]
+    #[cfg(feature = "i686-guest")]
     peb_file_mappings_offset: usize,
 
     guest_heap_buffer_offset: usize,
@@ -281,7 +281,7 @@ impl Debug for SandboxMemoryLayout {
             "Guest Heap Offset",
             &format_args!("{:#x}", self.peb_heap_data_offset),
         );
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         ff.field(
             "File Mappings Offset",
             &format_args!("{:#x}", self.peb_file_mappings_offset),
@@ -350,7 +350,7 @@ impl SandboxMemoryLayout {
         let peb_output_data_offset = peb_offset + offset_of!(HyperlightPEB, output_stack);
         let peb_init_data_offset = peb_offset + offset_of!(HyperlightPEB, init_data);
         let peb_heap_data_offset = peb_offset + offset_of!(HyperlightPEB, guest_heap);
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         let peb_file_mappings_offset = peb_offset + offset_of!(HyperlightPEB, file_mappings);
 
         // The following offsets are the actual values that relate to memory layout,
@@ -365,14 +365,14 @@ impl SandboxMemoryLayout {
         // many file mappings the host will register, so we reserve space for
         // the maximum number.
         // The heap starts at the next page boundary after this reserved area.
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         let file_mappings_array_end = peb_offset
             + size_of::<HyperlightPEB>()
             + hyperlight_common::mem::MAX_FILE_MAPPINGS
                 * size_of::<hyperlight_common::mem::FileMappingInfo>();
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         let guest_heap_buffer_offset = file_mappings_array_end.next_multiple_of(PAGE_SIZE_USIZE);
-        #[cfg(not(feature = "nanvix-unstable"))]
+        #[cfg(not(feature = "i686-guest"))]
         let guest_heap_buffer_offset =
             (peb_offset + size_of::<HyperlightPEB>()).next_multiple_of(PAGE_SIZE_USIZE);
 
@@ -386,7 +386,7 @@ impl SandboxMemoryLayout {
             peb_output_data_offset,
             peb_init_data_offset,
             peb_heap_data_offset,
-            #[cfg(feature = "nanvix-unstable")]
+            #[cfg(feature = "i686-guest")]
             peb_file_mappings_offset,
             sandbox_memory_config: cfg,
             code_size,
@@ -513,26 +513,26 @@ impl SandboxMemoryLayout {
 
     /// Get the offset in guest memory to the file_mappings count field
     /// (the `size` field of the `GuestMemoryRegion` in the PEB).
-    #[cfg(feature = "nanvix-unstable")]
+    #[cfg(feature = "i686-guest")]
     pub(crate) fn get_file_mappings_size_offset(&self) -> usize {
         self.peb_file_mappings_offset
     }
 
     /// Get the offset in guest memory to the file_mappings pointer field.
-    #[cfg(feature = "nanvix-unstable")]
+    #[cfg(feature = "i686-guest")]
     fn get_file_mappings_pointer_offset(&self) -> usize {
         self.get_file_mappings_size_offset() + size_of::<u64>()
     }
 
     /// Get the offset in snapshot memory where the FileMappingInfo array starts
     /// (immediately after the PEB struct, within the same page).
-    #[cfg(feature = "nanvix-unstable")]
+    #[cfg(feature = "i686-guest")]
     pub(crate) fn get_file_mappings_array_offset(&self) -> usize {
         self.peb_offset + size_of::<HyperlightPEB>()
     }
 
     /// Get the guest address of the FileMappingInfo array.
-    #[cfg(feature = "nanvix-unstable")]
+    #[cfg(feature = "i686-guest")]
     fn get_file_mappings_array_gva(&self) -> u64 {
         (Self::BASE_ADDRESS + self.get_file_mappings_array_offset()) as u64
     }
@@ -641,7 +641,7 @@ impl SandboxMemoryLayout {
         }
 
         // PEB + preallocated FileMappingInfo array
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         let heap_offset = {
             let peb_and_array_size = size_of::<HyperlightPEB>()
                 + hyperlight_common::mem::MAX_FILE_MAPPINGS
@@ -652,7 +652,7 @@ impl SandboxMemoryLayout {
                 Peb,
             )
         };
-        #[cfg(not(feature = "nanvix-unstable"))]
+        #[cfg(not(feature = "i686-guest"))]
         let heap_offset =
             builder.push_page_aligned(size_of::<HyperlightPEB>(), MemoryRegionFlags::READ, Peb);
 
@@ -799,9 +799,9 @@ impl SandboxMemoryLayout {
         //   later by map_file_cow / evolve).
         // - The `ptr` field holds the guest address of the preallocated
         //   FileMappingInfo array
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         write_u64(mem, self.get_file_mappings_size_offset(), 0)?;
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         write_u64(
             mem,
             self.get_file_mappings_pointer_offset(),
@@ -863,11 +863,11 @@ mod tests {
         expected_size += layout.code_size;
 
         // PEB + preallocated FileMappingInfo array
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         let peb_and_array = size_of::<HyperlightPEB>()
             + hyperlight_common::mem::MAX_FILE_MAPPINGS
                 * size_of::<hyperlight_common::mem::FileMappingInfo>();
-        #[cfg(not(feature = "nanvix-unstable"))]
+        #[cfg(not(feature = "i686-guest"))]
         let peb_and_array = size_of::<HyperlightPEB>();
         expected_size += peb_and_array.next_multiple_of(PAGE_SIZE_USIZE);
 

src/hyperlight_host/src/mem/mgr.rs

@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
  */
-#[cfg(feature = "nanvix-unstable")]
+#[cfg(feature = "i686-guest")]
 use std::mem::offset_of;
 
 use flatbuffers::FlatBufferBuilder;
@@ -361,7 +361,7 @@ impl SandboxMemoryManager<HostSharedMemory> {
     ///
     /// [`FileMappingInfo`]: hyperlight_common::mem::FileMappingInfo
     /// [`MAX_FILE_MAPPINGS`]: hyperlight_common::mem::MAX_FILE_MAPPINGS
-    #[cfg(feature = "nanvix-unstable")]
+    #[cfg(feature = "i686-guest")]
     pub(crate) fn write_file_mapping_entry(
         &mut self,
         guest_addr: u64,

src/hyperlight_host/src/sandbox/file_mapping.rs

@@ -58,7 +58,7 @@ pub(crate) struct PreparedFileMapping {
     /// The page-aligned size of the mapping in bytes.
     pub(crate) size: usize,
     /// Null-terminated C-style label for this mapping (max 63 chars + null).
-    #[cfg_attr(not(feature = "nanvix-unstable"), allow(unused))]
+    #[cfg_attr(not(feature = "i686-guest"), allow(unused))]
     pub(crate) label: [u8; hyperlight_common::mem::FILE_MAPPING_LABEL_MAX_LEN + 1],
     /// Host-side OS resources. `None` after successful consumption
     /// by the apply step (ownership transferred to the VM layer).

src/hyperlight_host/src/sandbox/initialized_multi_use.rs

@@ -616,13 +616,13 @@ impl MultiUseSandbox {
 
         // Pre-check the file mapping limit before doing any expensive
         // OS or VM work. The PEB count is the source of truth.
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         let current_count = self
             .mem_mgr
             .shared_mem
             .read::<u64>(self.mem_mgr.layout.get_file_mappings_size_offset())?
             as usize;
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         if current_count >= hyperlight_common::mem::MAX_FILE_MAPPINGS {
             return Err(crate::HyperlightError::Error(format!(
                 "map_file_cow: file mapping limit reached ({} of {})",
@@ -694,7 +694,7 @@ impl MultiUseSandbox {
         // still holds a valid mapping but the PEB won't list it — the
         // limit was already pre-checked above so this should not fail
         // in practice.
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         self.mem_mgr
             .write_file_mapping_entry(prepared.guest_base, size, &prepared.label)?;
 
@@ -2192,7 +2192,7 @@ mod tests {
     /// the FileMappingInfo entry (count, guest_addr, size, label) into
     /// the PEB.
     #[test]
-    #[cfg(feature = "nanvix-unstable")]
+    #[cfg(feature = "i686-guest")]
     fn test_map_file_cow_peb_entry_multiuse() {
         use std::mem::offset_of;
 
@@ -2268,7 +2268,7 @@ mod tests {
     /// Tests that deferred `map_file_cow` (before evolve) correctly
     /// writes FileMappingInfo entries into the PEB during evolve.
     #[test]
-    #[cfg(feature = "nanvix-unstable")]
+    #[cfg(feature = "i686-guest")]
     fn test_map_file_cow_peb_entry_deferred() {
         use std::mem::offset_of;
 
@@ -2342,7 +2342,7 @@ mod tests {
     /// populates all PEB FileMappingInfo slots with the right guest_addr,
     /// size, and label for each entry.
     #[test]
-    #[cfg(feature = "nanvix-unstable")]
+    #[cfg(feature = "i686-guest")]
     fn test_map_file_cow_peb_multiple_entries() {
         use std::mem::{offset_of, size_of};
 

src/hyperlight_host/src/sandbox/snapshot.rs

@@ -997,7 +997,10 @@ impl Snapshot {
                 Ok::<(Vec<u8>, Vec<u8>), crate::HyperlightError>((snapshot_memory, pt_bytes))
             })
         })???;
+        #[cfg(feature = "i686-guest")]
         let (memory, separate_pt_bytes) = memory;
+        #[cfg(not(feature = "i686-guest"))]
+        let (memory, _) = memory;
         layout.set_snapshot_size(memory.len());
 
         // For i686, keep the regions so the RAMFS and other map_file_cow

src/hyperlight_host/src/sandbox/uninitialized_evolve.rs

@@ -114,7 +114,7 @@ pub(super) fn evolve_impl_multi_use(u_sbox: UninitializedSandbox) -> Result<Mult
         // it — acceptable since we're about to return Err and the
         // VM will be dropped. The limit was already validated in
         // UninitializedSandbox::map_file_cow.
-        #[cfg(feature = "nanvix-unstable")]
+        #[cfg(feature = "i686-guest")]
         hshm.write_file_mapping_entry(prepared.guest_base, prepared.size as u64, &prepared.label)?;
         hshm.mapped_rgns += 1;
     }