fix: run cargo fmt

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

Author: andreiltd

src/hyperlight_common/src/arch/amd64/vmem.rs

@@ -282,10 +282,8 @@ pub unsafe fn walk_va_spaces<Op: TableReadOps>(
 )> {
     use ::alloc::vec::Vec;
 
-    let mut out: Vec<(
-        crate::vmem::SpaceId,
-        Vec<crate::vmem::SpaceAwareMapping>,
-    )> = Vec::with_capacity(roots.len());
+    let mut out: Vec<(crate::vmem::SpaceId, Vec<crate::vmem::SpaceAwareMapping>)> =
+        Vec::with_capacity(roots.len());
 
     let addr = address & ((1u64 << VA_BITS) - 1);
     let vmin = addr & !(PAGE_SIZE as u64 - 1);

src/hyperlight_common/src/arch/i686/vmem.rs

@@ -346,7 +346,12 @@ pub unsafe fn space_aware_map<Op: TableOps>(
 
     let new_pde: u64 = their_pt_pa | (their_pde & !PTE_ADDR_MASK) | PAGE_PRESENT;
     unsafe {
-        write_entry_updating(op, Op::TableMovability::root_update_parent(), our_pde_ptr, new_pde);
+        write_entry_updating(
+            op,
+            Op::TableMovability::root_update_parent(),
+            our_pde_ptr,
+            new_pde,
+        );
     }
 }
 

src/hyperlight_common/src/vmem.rs

@@ -576,6 +576,22 @@ pub enum SpaceAwareMapping {
     AnotherSpace(SpaceReferenceMapping),
 }
 
+/// Counterpart of [`walk_va_spaces`]'s `AnotherSpace` entries on the
+/// write side: installs a link in `op`'s root PT tree at `ref_map.our_va`
+/// that points at whatever intermediate table the owning space ended
+/// up with at `ref_map.their_va` (in `built_roots[ref_map.space]`).
+///
+/// Callers must process [`SpaceAwareMapping`]s in the order returned
+/// by `walk_va_spaces`, populating `built_roots` with each space's
+/// rebuilt root PA before moving on to the next space — that way, by
+/// the time we see an `AnotherSpace` entry, the owning space's
+/// rebuilt root is guaranteed to be in `built_roots`.
+///
+/// # Safety
+/// Same invariants as [`map`]: the caller owns the concurrency story
+/// around the page tables being written, and must invalidate TLBs
+/// afterwards if they were live.
+pub use arch::space_aware_map;
 /// Walk multiple page-table roots together, emitting either a normal
 /// leaf mapping (`ThisSpace`) or a reference to an alias that was
 /// already seen via an earlier root (`AnotherSpace`).
@@ -597,20 +613,3 @@ pub enum SpaceAwareMapping {
 /// Same invariants as [`virt_to_phys`]. Callers must ensure the page
 /// tables are not being mutated concurrently.
 pub use arch::walk_va_spaces;
-
-/// Counterpart of [`walk_va_spaces`]'s `AnotherSpace` entries on the
-/// write side: installs a link in `op`'s root PT tree at `ref_map.our_va`
-/// that points at whatever intermediate table the owning space ended
-/// up with at `ref_map.their_va` (in `built_roots[ref_map.space]`).
-///
-/// Callers must process [`SpaceAwareMapping`]s in the order returned
-/// by `walk_va_spaces`, populating `built_roots` with each space's
-/// rebuilt root PA before moving on to the next space — that way, by
-/// the time we see an `AnotherSpace` entry, the owning space's
-/// rebuilt root is guaranteed to be in `built_roots`.
-///
-/// # Safety
-/// Same invariants as [`map`]: the caller owns the concurrency story
-/// around the page tables being written, and must invalidate TLBs
-/// afterwards if they were live.
-pub use arch::space_aware_map;

src/hyperlight_host/src/sandbox/snapshot.rs

@@ -20,8 +20,7 @@ use std::sync::atomic::{AtomicU64, Ordering};
 use hyperlight_common::layout::{scratch_base_gpa, scratch_base_gva};
 use hyperlight_common::vmem;
 use hyperlight_common::vmem::{
-    BasicMapping, CowMapping, Mapping, MappingKind, PAGE_SIZE, SpaceAwareMapping, SpaceId,
-    TableOps,
+    BasicMapping, CowMapping, Mapping, MappingKind, PAGE_SIZE, SpaceAwareMapping, SpaceId, TableOps,
 };
 use tracing::{Span, instrument};
 
@@ -495,7 +494,13 @@ impl Snapshot {
                                     continue;
                                 }
                                 let Some(contents) = (unsafe {
-                                    guest_page(snap_c, scratch_c, &regions, layout, mapping.phys_base)
+                                    guest_page(
+                                        snap_c,
+                                        scratch_c,
+                                        &regions,
+                                        layout,
+                                        mapping.phys_base,
+                                    )
                                 }) else {
                                     continue;
                                 };