loader: Re-organize module layout

Re-organize modules of `loader` to follow image format, enable reuse of
code across different architectures. Its interface is unchanged.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>

Author: RuoqingHe

.buildkite/download_resources.sh

@@ -16,6 +16,6 @@ mkdir -p ${EXTRACT_PATH}
 curl $DEB_URL -o ${DEB_PATH}
 dpkg-deb -x ${DEB_PATH} ${EXTRACT_PATH}
 
-mv ${BZIMAGE_PATH} "${SCRIPTPATH}/../src/loader/x86_64/bzimage/bzimage"
+mv ${BZIMAGE_PATH} "${SCRIPTPATH}/../src/loader/bzimage/bzimage"
 rm -r ${EXTRACT_PATH}
 rm -f ${DEB_PATH}

benches/x86_64/mod.rs

@@ -35,7 +35,7 @@ fn create_guest_memory() -> GuestMemoryMmap {
 fn create_elf_pvh_image() -> Vec<u8> {
     include_bytes!(concat!(
         env!("CARGO_MANIFEST_DIR"),
-        "/src/loader/x86_64/elf/test_elfnote.bin"
+        "/src/loader/elf/test_elfnote.bin"
     ))
     .to_vec()
 }
@@ -83,10 +83,7 @@ fn download_resources() {
 fn create_bzimage() -> Vec<u8> {
     download_resources();
     let mut v = Vec::new();
-    let path = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/src/loader/x86_64/bzimage/bzimage"
-    );
+    let path = concat!(env!("CARGO_MANIFEST_DIR"), "/src/loader/bzimage/bzimage");
     let mut f = File::open(path).unwrap();
     f.read_to_end(&mut v).unwrap();
 

docs/TESTING.md

@@ -78,5 +78,5 @@ git checkout 57e614a
 
 g++ bad_align_writer.cpp -o bad_align_writer -I. -std=c++11
 ./bad_align_writer
-cp test_bad_align.bin "${LINUX_LOADER_PATH}/src/loader/x86_64/elf/"
+cp test_bad_align.bin "${LINUX_LOADER_PATH}/src/loader/elf/"
 ```

src/lib.rs

@@ -68,7 +68,7 @@
 //!     let mut elf_pvh_image = Vec::new();
 //!     let path = concat!(
 //!         env!("CARGO_MANIFEST_DIR"),
-//!         "/src/loader/x86_64/elf/test_elfnote.bin"
+//!         "/src/loader/elf/test_elfnote.bin"
 //!     );
 //!     let mut file = File::open(path).unwrap();
 //!     file.read_to_end(&mut elf_pvh_image).unwrap();

src/loader/aarch64/mod.rs

@@ -16,7 +16,7 @@ use std::io::{Seek, SeekFrom};
 
 use vm_memory::{Address, ByteValued, GuestAddress, GuestMemory, GuestUsize, ReadVolatile};
 
-use super::super::{
+use crate::loader::{
     bootparam, Error as KernelLoaderError, KernelLoader, KernelLoaderResult, Result,
 };
 
@@ -209,10 +209,7 @@ mod tests {
     fn make_bzimage() -> Vec<u8> {
         download_resources();
         let mut v = Vec::new();
-        let path = concat!(
-            env!("CARGO_MANIFEST_DIR"),
-            "/src/loader/x86_64/bzimage/bzimage"
-        );
+        let path = concat!(env!("CARGO_MANIFEST_DIR"), "/src/loader/bzimage/bzimage");
         let mut f = File::open(path).unwrap();
         f.read_to_end(&mut v).unwrap();
 
@@ -297,11 +294,11 @@ mod tests {
 
     #[test]
     fn test_invalid_bzimage_underflow() {
-        use super::super::super::Error as LoaderError;
+        use crate::loader::Error as LoaderError;
 
         let path = concat!(
             env!("CARGO_MANIFEST_DIR"),
-            "/src/loader/x86_64/bzimage/fuzz_invalid_bzimage.bin"
+            "/src/loader/bzimage/fuzz_invalid_bzimage.bin"
         );
 
         let gm = create_guest_mem();