renamed kernel_loader to kernel

The plan is to add all kernel related functionality to this module
as separate modules. One of the first things that will be moved here
is the Kernel Command Line.
The first module in this new crate is the loader that contains all
the code that was previously in the kernel_loader crate.

Signed-off-by: Andreea Florescu <[email protected]>

Author: andreeaflorescu

api_server/Cargo.toml

@@ -22,7 +22,7 @@ vmm = { path = "../vmm" }
 
 [dev-dependencies]
 devices = { path = "../devices" }
-kernel_loader = { path = "../kernel_loader" }
+kernel = { path = "../kernel" }
 memory_model = { path = "../memory_model" }
 net_util = { path = "../net_util" }
 x86_64 = { path = "../x86_64" }

api_server/src/request/mod.rs

@@ -101,7 +101,7 @@ impl PartialEq for ParsedRequest {
 #[cfg(test)]
 mod tests {
     extern crate devices;
-    extern crate kernel_loader;
+    extern crate kernel;
     extern crate memory_model;
     extern crate net_util;
     extern crate x86_64;
@@ -303,7 +303,7 @@ mod tests {
         check_error_response(vmm_resp, StatusCode::InternalServerError);
         let vmm_resp = VmmActionError::StartMicrovm(
             ErrorKind::User,
-            StartMicrovmError::Loader(kernel_loader::Error::BigEndianElfOnLittle),
+            StartMicrovmError::Loader(kernel::loader::Error::BigEndianElfOnLittle),
         );
         check_error_response(vmm_resp, StatusCode::BadRequest);
         let vmm_resp =

kernel_loader/Cargo.toml renamed to kernel/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "kernel_loader"
+name = "kernel"
 version = "0.1.0"
 
 [dependencies]

kernel/src/lib.rs

@@ -0,0 +1,5 @@
+pub mod loader;
+
+extern crate memory_model;
+extern crate sys_util;
+extern crate x86_64;

kernel_loader/src/elf.rs renamed to kernel/src/loader/elf.rs

@@ -1,16 +1,14 @@
 // 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 file.
-
-extern crate memory_model;
-extern crate sys_util;
-extern crate x86_64;
-
+use std;
 use std::ffi::CStr;
 use std::io::{Read, Seek, SeekFrom};
 use std::mem;
 
 use memory_model::{GuestAddress, GuestMemory};
+use sys_util;
+use x86_64;
 
 #[allow(dead_code)]
 #[allow(non_camel_case_types)]

kernel_loader/src/lib.rs renamed to kernel/src/loader/mod.rs

@@ -15,7 +15,7 @@ timerfd = ">=1.0"
 
 data_model = { path = "../data_model" }
 devices = { path = "../devices" }
-kernel_loader = { path = "../kernel_loader" }
+kernel = { path = "../kernel" }
 kvm = { path = "../kvm" }
 logger = { path = "../logger" }
 memory_model = { path = "../memory_model" }

kernel_loader/src/test_elf.bin renamed to kernel/src/loader/test_elf.bin

@@ -9,7 +9,7 @@ extern crate timerfd;
 
 extern crate data_model;
 extern crate devices;
-extern crate kernel_loader;
+extern crate kernel;
 extern crate kvm;
 #[macro_use]
 extern crate logger;
@@ -51,6 +51,7 @@ use device_manager::legacy::LegacyDeviceManager;
 use device_manager::mmio::MMIODeviceManager;
 use devices::virtio;
 use devices::{DeviceEventT, EpollHandler, EpollHandlerPayload};
+use kernel::loader as kernel_loader;
 use kvm::*;
 use logger::{Level, Metric, LOGGER, METRICS};
 use memory_model::{GuestAddress, GuestMemory};

vmm/Cargo.toml

@@ -3,7 +3,7 @@ use std::fmt::{Display, Formatter, Result};
 
 use device_manager;
 use devices;
-use kernel_loader;
+use kernel::loader as kernel_loader;
 use memory_model::GuestMemoryError;
 use sys_util;
 use vstate;