Pass boot parameters by reference to guest mem

Signed-off-by: Alexandra Iordache <aghecen@amazon.com>

Author: Alexandra Iordache

benches/aarch64/mod.rs

@@ -38,7 +38,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("configure_fdt", |b| {
         b.iter(|| {
             black_box(FdtBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-                fdt_boot_params.clone(),
+                &fdt_boot_params,
                 &guest_mem,
             ))
             .unwrap();

benches/x86_64/mod.rs

@@ -97,7 +97,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("configure_pvh", |b| {
         b.iter(|| {
             black_box(PvhBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-                pvh_boot_params.clone(),
+                &pvh_boot_params,
                 &guest_mem,
             ))
             .unwrap();

src/configurator/aarch64/fdt.rs

@@ -71,12 +71,12 @@ impl BootConfigurator for FdtBootConfigurator {
     /// let guest_memory = create_guest_memory();
     /// let (fdt, fdt_addr) = create_fdt(&guest_memory);
     /// FdtBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-    ///     BootParams::new::<FdtPlaceholder>(&fdt, fdt_addr),
+    ///     &BootParams::new::<FdtPlaceholder>(&fdt, fdt_addr),
     ///     &guest_memory,
     /// ).unwrap();
     /// # }
     /// ```
-    fn write_bootparams<M>(params: BootParams, guest_memory: &M) -> Result<()>
+    fn write_bootparams<M>(params: &BootParams, guest_memory: &M) -> Result<()>
     where
         M: GuestMemory,
     {
@@ -116,7 +116,7 @@ mod tests {
         let fdt_addr = GuestAddress(guest_memory.last_addr().raw_value() - FDT_MAX_SIZE as u64 + 1);
         assert_eq!(
             FdtBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-                BootParams::new::<FdtPlaceholder>(&fdt, fdt_addr),
+                &BootParams::new::<FdtPlaceholder>(&fdt, fdt_addr),
                 &guest_memory,
             )
             .err(),
@@ -125,7 +125,7 @@ mod tests {
 
         let fdt_addr = GuestAddress(guest_memory.last_addr().raw_value() - FDT_MAX_SIZE as u64);
         assert!(FdtBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-            BootParams::new::<FdtPlaceholder>(&fdt, fdt_addr),
+            &BootParams::new::<FdtPlaceholder>(&fdt, fdt_addr),
             &guest_memory,
         )
         .is_ok());

src/configurator/mod.rs

@@ -120,7 +120,7 @@ pub trait BootConfigurator {
     ///              sections and modules, and their associated addresses in guest memory. These
     ///              vary with the boot protocol used.
     /// * `guest_memory` - guest's physical memory.
-    fn write_bootparams<M>(params: BootParams, guest_memory: &M) -> Result<()>
+    fn write_bootparams<M>(params: &BootParams, guest_memory: &M) -> Result<()>
     where
         M: GuestMemory;
 }

src/configurator/x86_64/linux.rs

@@ -90,14 +90,14 @@ impl BootConfigurator for LinuxBootConfigurator {
     ///     let params = build_bootparams();
     ///     let mut bootparams = BootParams::new::<boot_params>(&params, zero_page_addr);
     ///     LinuxBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-    ///         bootparams,
+    ///         &bootparams,
     ///         &guest_memory,
     ///     ).unwrap();
     /// }
     /// ```
     ///
     /// [`boot_params`]: ../loader/bootparam/struct.boot_params.html
-    fn write_bootparams<M>(params: BootParams, guest_memory: &M) -> Result<()>
+    fn write_bootparams<M>(params: &BootParams, guest_memory: &M) -> Result<()>
     where
         M: GuestMemory,
     {
@@ -155,18 +155,15 @@ mod tests {
         );
         let mut bootparams = BootParams::new::<boot_params>(&params, bad_zeropg_addr);
         assert_eq!(
-            LinuxBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-                bootparams.clone(),
-                &guest_memory,
-            )
-            .err(),
+            LinuxBootConfigurator::write_bootparams::<GuestMemoryMmap>(&bootparams, &guest_memory,)
+                .err(),
             Some(Error::ZeroPagePastRamEnd.into()),
         );
 
         // Success case.
         bootparams.header_start = zero_page_addr;
         assert!(LinuxBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-            bootparams,
+            &bootparams,
             &guest_memory,
         )
         .is_ok());

src/configurator/x86_64/pvh.rs

@@ -124,18 +124,18 @@ impl BootConfigurator for PvhBootConfigurator {
     ///
     ///     let mut boot_params = BootParams::new::<hvm_start_info>(&start_info, start_info_addr);
     ///     boot_params.set_sections::<hvm_memmap_table_entry>(&memmap_entries, memmap_addr);
-    ///     PvhBootConfigurator::write_bootparams::<GuestMemoryMmap>(boot_params, &guest_mem).unwrap();
+    ///     PvhBootConfigurator::write_bootparams::<GuestMemoryMmap>(&boot_params, &guest_mem).unwrap();
     /// }
     /// ```
-    fn write_bootparams<M>(params: BootParams, guest_memory: &M) -> Result<()>
+    fn write_bootparams<M>(params: &BootParams, guest_memory: &M) -> Result<()>
     where
         M: GuestMemory,
     {
         // The VMM has filled an `hvm_start_info` struct and a `Vec<hvm_memmap_table_entry>`
         // and has passed them on to this function.
         // The `hvm_start_info` will be written at `addr` and the memmap entries at
         // `start_info.0.memmap_paddr`.
-        let memmap = params.sections.ok_or(Error::MemmapTableMissing)?;
+        let memmap = params.sections.as_ref().ok_or(Error::MemmapTableMissing)?;
         let memmap_addr = params
             .sections_start
             .ok_or(Error::MemmapTableAddressMissing)?;
@@ -202,11 +202,8 @@ mod tests {
 
         // Error case: configure without memory map.
         assert_eq!(
-            PvhBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-                boot_params.clone(),
-                &guest_memory,
-            )
-            .err(),
+            PvhBootConfigurator::write_bootparams::<GuestMemoryMmap>(&boot_params, &guest_memory,)
+                .err(),
             Some(Error::MemmapTableMissing.into())
         );
 
@@ -217,11 +214,8 @@ mod tests {
         boot_params.set_sections::<hvm_memmap_table_entry>(&memmap_entries, memmap_addr);
         boot_params.header_start = bad_start_info_addr;
         assert_eq!(
-            PvhBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-                boot_params.clone(),
-                &guest_memory,
-            )
-            .err(),
+            PvhBootConfigurator::write_bootparams::<GuestMemoryMmap>(&boot_params, &guest_memory,)
+                .err(),
             Some(Error::StartInfoPastRamEnd.into())
         );
 
@@ -235,17 +229,14 @@ mod tests {
         boot_params.set_sections::<hvm_memmap_table_entry>(&memmap_entries, bad_memmap_addr);
 
         assert_eq!(
-            PvhBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-                boot_params.clone(),
-                &guest_memory,
-            )
-            .err(),
+            PvhBootConfigurator::write_bootparams::<GuestMemoryMmap>(&boot_params, &guest_memory,)
+                .err(),
             Some(Error::MemmapTablePastRamEnd.into())
         );
 
         boot_params.set_sections::<hvm_memmap_table_entry>(&memmap_entries, memmap_addr);
         assert!(PvhBootConfigurator::write_bootparams::<GuestMemoryMmap>(
-            boot_params,
+            &boot_params,
             &guest_memory,
         )
         .is_ok());