[hyperlight_host/exe] Allow load() to consume the exe_info

This will be useful in the near future, when it will allow
transforming the exe_info into unwind information without an extra
copy.

Signed-off-by: Lucy Menon <[email protected]>

Author: syntactically

src/hyperlight_host/src/mem/elf.rs

@@ -68,7 +68,7 @@ impl ElfInfo {
             .unwrap(); // guaranteed not to panic because of the check in new()
         (max_phdr.p_vaddr + max_phdr.p_memsz - self.get_base_va()) as usize
     }
-    pub(crate) fn load_at(&self, load_addr: usize, target: &mut [u8]) -> Result<()> {
+    pub(crate) fn load_at(self, load_addr: usize, target: &mut [u8]) -> Result<()> {
         let base_va = self.get_base_va();
         for phdr in self.phdrs.iter().filter(|phdr| phdr.p_type == PT_LOAD) {
             let start_va = (phdr.p_vaddr - base_va) as usize;

src/hyperlight_host/src/mem/exe.rs

@@ -80,9 +80,9 @@ impl ExeInfo {
     // copying into target, but the PE loader chooses to apply
     // relocations in its owned representation of the PE contents,
     // which requires it to be &mut.
-    pub fn load(&mut self, load_addr: usize, target: &mut [u8]) -> Result<()> {
+    pub fn load(self, load_addr: usize, target: &mut [u8]) -> Result<()> {
         match self {
-            ExeInfo::PE(pe) => {
+            ExeInfo::PE(mut pe) => {
                 let patches = pe.get_exe_relocation_patches(load_addr)?;
                 pe.apply_relocation_patches(patches)?;
                 target[0..pe.payload.len()].copy_from_slice(&pe.payload);

src/hyperlight_host/src/mem/mgr.rs

@@ -391,12 +391,12 @@ impl SandboxMemoryManager<ExclusiveSharedMemory> {
     #[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
     pub(crate) fn load_guest_binary_into_memory(
         cfg: SandboxConfiguration,
-        exe_info: &mut ExeInfo,
+        mut exe_info: ExeInfo,
         inprocess: bool,
     ) -> Result<Self> {
         let (layout, mut shared_mem, load_addr, entrypoint_offset) = load_guest_binary_common(
             cfg,
-            exe_info,
+            &mut exe_info,
             |shared_mem: &ExclusiveSharedMemory, layout: &SandboxMemoryLayout| {
                 let addr_usize = if inprocess {
                     // if we're running in-process, load_addr is the absolute

src/hyperlight_host/src/sandbox/outb.rs

@@ -228,13 +228,10 @@ mod tests {
         let sandbox_cfg = SandboxConfiguration::default();
 
         let new_mgr = || {
-            let mut exe_info = simple_guest_exe_info().unwrap();
-            let mut mgr = SandboxMemoryManager::load_guest_binary_into_memory(
-                sandbox_cfg,
-                &mut exe_info,
-                false,
-            )
-            .unwrap();
+            let exe_info = simple_guest_exe_info().unwrap();
+            let mut mgr =
+                SandboxMemoryManager::load_guest_binary_into_memory(sandbox_cfg, exe_info, false)
+                    .unwrap();
             let mem_size = mgr.get_shared_mem_mut().mem_size();
             let layout = mgr.layout;
             let shared_mem = mgr.get_shared_mem_mut();
@@ -348,10 +345,10 @@ mod tests {
         let sandbox_cfg = SandboxConfiguration::default();
         tracing::subscriber::with_default(subscriber.clone(), || {
             let new_mgr = || {
-                let mut exe_info = simple_guest_exe_info().unwrap();
+                let exe_info = simple_guest_exe_info().unwrap();
                 let mut mgr = SandboxMemoryManager::load_guest_binary_into_memory(
                     sandbox_cfg,
-                    &mut exe_info,
+                    exe_info,
                     false,
                 )
                 .unwrap();

src/hyperlight_host/src/sandbox/uninitialized.rs

@@ -299,7 +299,7 @@ impl UninitializedSandbox {
             };
             SandboxMemoryManager::load_guest_binary_using_load_library(cfg, path, &mut exe_info)
         } else {
-            SandboxMemoryManager::load_guest_binary_into_memory(cfg, &mut exe_info, inprocess)
+            SandboxMemoryManager::load_guest_binary_into_memory(cfg, exe_info, inprocess)
         }
     }
 }