refactor autogenerated files

Signed-off-by: Alexandra Iordache <[email protected]>

coverage_config_x86_64.json

@@ -1,5 +1,6 @@
 {
-  "coverage_score": 81,
+  "coverage_score": 84.8,
   "exclude_path": "",
-  "crate_features": "bzimage,elf"
+  "crate_features": "bzimage,elf",
+  "exclude_path": "loader_gen"
 }

src/configurator/x86_64/linux.rs

@@ -124,7 +124,7 @@ impl BootConfigurator for LinuxBootConfigurator {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::loader::bootparam::boot_params;
+    use crate::loader_gen::bootparam::boot_params;
     use std::mem;
     use vm_memory::{Address, GuestAddress, GuestMemoryMmap};
 

src/configurator/x86_64/pvh.rs

@@ -15,7 +15,7 @@
 use vm_memory::{ByteValued, Bytes, GuestMemory};
 
 use crate::configurator::{BootConfigurator, BootParams, Error as BootConfiguratorError, Result};
-use crate::loader::elf::start_info::{hvm_memmap_table_entry, hvm_modlist_entry, hvm_start_info};
+use crate::loader_gen::start_info::{hvm_memmap_table_entry, hvm_modlist_entry, hvm_start_info};
 
 use std::error::Error as StdError;
 use std::fmt;

src/lib.rs

@@ -93,4 +93,9 @@ pub mod cmdline;
 pub mod configurator;
 pub mod loader;
 
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+mod loader_gen;
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+pub use loader_gen::*;
+
 extern crate vm_memory;

src/loader/mod.rs

@@ -24,20 +24,11 @@ use std::ffi::CStr;
 use std::fmt::{self, Display};
 use std::io::{Read, Seek};
 
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use vm_memory::ByteValued;
 use vm_memory::{Address, Bytes, GuestAddress, GuestMemory, GuestUsize};
 
-#[allow(dead_code)]
-#[allow(non_camel_case_types)]
-#[allow(non_snake_case)]
-#[allow(non_upper_case_globals)]
-#[allow(missing_docs)]
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::all))]
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-// Hide the autogenerated documentation for bindgen'ed sources.
-#[doc(hidden)]
-pub mod bootparam;
+pub use crate::loader_gen::bootparam;
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 mod x86_64;

src/loader/x86_64/elf/mod.rs

@@ -18,18 +18,9 @@ use std::mem;
 
 use vm_memory::{Address, ByteValued, Bytes, GuestAddress, GuestMemory, GuestUsize};
 
-use super::super::{Error as KernelLoaderError, KernelLoader, KernelLoaderResult, Result};
-
-#[allow(dead_code)]
-#[allow(non_camel_case_types)]
-#[allow(non_snake_case)]
-#[allow(non_upper_case_globals)]
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::all))]
-mod elf;
-
-#[allow(missing_docs)]
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::all))]
-pub mod start_info;
+use crate::loader::{Error as KernelLoaderError, KernelLoader, KernelLoaderResult, Result};
+use crate::loader_gen::elf;
+pub use crate::loader_gen::start_info;
 
 unsafe impl ByteValued for elf::Elf64_Ehdr {}
 unsafe impl ByteValued for elf::Elf64_Nhdr {}

src/loader_gen/mod.rs

@@ -0,0 +1,15 @@
+// Copyright (c) 2019 Intel Corporation. All rights reserved.
+// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+// Copyright 2017 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE-BSD-3-Clause file.
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
+
+//! Bindgen autogenerated structs for boot parameters.
+
+#![cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+
+mod x86_64;
+pub use x86_64::*;

src/loader_gen/x86_64/mod.rs

@@ -0,0 +1,29 @@
+// Copyright (c) 2019 Intel Corporation. All rights reserved.
+// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+// Copyright 2017 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE-BSD-3-Clause file.
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
+
+//! Bindgen autogenerated structs for `x86_64` boot parameters.
+
+#![cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::all))]
+#![allow(dead_code)]
+#![allow(missing_docs)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+#![allow(non_upper_case_globals)]
+
+// Hide the autogenerated documentation for bindgen'ed sources.
+#[doc(hidden)]
+pub mod bootparam;
+
+#[cfg(feature = "elf")]
+pub mod elf;
+
+#[cfg(feature = "elf")]
+pub mod start_info;