Allow KernelLoaderResult to also store the Elf64_Phdr

Signed-off-by: Sergiu Moga <sergiu@unikraft.io>

Author: mogasergiu

src/lib.rs

@@ -105,7 +105,7 @@ pub mod loader;
 
 #[allow(clippy::undocumented_unsafe_blocks)]
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-mod loader_gen;
+pub mod loader_gen;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub use loader_gen::*;
 

src/loader/elf/mod.rs

@@ -249,7 +249,7 @@ impl KernelLoader for Elf {
         }
 
         // Read in each section pointed to by the program headers.
-        for phdr in phdrs {
+        for phdr in &phdrs {
             if phdr.p_type != elf::PT_LOAD || phdr.p_filesz == 0 {
                 if phdr.p_type == elf::PT_NOTE {
                     // The PVH boot protocol currently requires that the kernel is loaded at
@@ -293,6 +293,7 @@ impl KernelLoader for Elf {
 
         // elf image has no setup_header which is defined for bzImage
         loader_result.setup_header = None;
+        loader_result.phdrs = phdrs;
 
         Ok(loader_result)
     }

src/loader/mod.rs

@@ -143,7 +143,7 @@ impl From<pe::Error> for Error {
 /// This specifies where the kernel is loading and passes additional
 /// information for the rest of the boot process to be completed by
 /// the VMM.
-#[derive(Clone, Copy, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, Default, PartialEq)]
 pub struct KernelLoaderResult {
     /// Address in the guest memory where the kernel image starts to be loaded.
     pub kernel_load: GuestAddress,
@@ -159,8 +159,12 @@ pub struct KernelLoaderResult {
     /// <https://xenbits.xen.org/docs/unstable/misc/pvh.html>
     #[cfg(all(feature = "elf", any(target_arch = "x86", target_arch = "x86_64")))]
     pub pvh_boot_cap: elf::PvhBootCapability,
+    /// Program headers.
+    #[cfg(all(feature = "elf", any(target_arch = "x86", target_arch = "x86_64")))]
+    pub phdrs: Vec<crate::loader_gen::elf::Elf64_Phdr>,
 }
 
+
 /// Trait that specifies kernel image loading support.
 pub trait KernelLoader {
     /// How to load a specific kernel image format into the guest memory.

src/loader_gen/x86_64/elf.rs

@@ -75,7 +75,7 @@ pub struct elf64_hdr {
 pub type Elf64_Ehdr = elf64_hdr;
 
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub struct elf64_phdr {
     pub p_type: Elf64_Word,
     pub p_flags: Elf64_Word,