From 513d2fdcf66569313d7d79ab2e738e81fb9dcdc0 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Wed, 14 Aug 2019 17:31:10 +0100
Subject: [PATCH] arch: x86_64: Update linux-loader crate

The linux-loader crate has been updated with a regnerated bootparams.rs
which has changed the API slightly. Update to the latest linux-loader
and adapt the code to reflect the changes:

* e820_map is renamed to e820_table (and all similar variables updated)
* e820entry is renamed to boot_e820_entry
* The E820 type constants are not no longer included

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 Cargo.lock             |  2 +-
 arch/src/x86_64/mod.rs | 36 +++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8465cf209..2c6e5802a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
 [[package]]
 name = "linux-loader"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/linux-loader#891ea4f0af62b2f80f5a3ddbbb6be588b19a78da"
+source = "git+https://github.com/rust-vmm/linux-loader#b2700818add982aa361842a0b8da776b3d1b5cb3"
 dependencies = [
  "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
 ]
diff --git a/arch/src/x86_64/mod.rs b/arch/src/x86_64/mod.rs
index 24e143da3..6081851e4 100644
--- a/arch/src/x86_64/mod.rs
+++ b/arch/src/x86_64/mod.rs
@@ -12,12 +12,14 @@ mod mptable;
 pub mod regs;
 
 use crate::RegionType;
-use linux_loader::loader::bootparam::{boot_params, setup_header, E820_RAM};
+use linux_loader::loader::bootparam::{boot_params, setup_header};
 use std::mem;
 use vm_memory::{
     Address, ByteValued, Bytes, GuestAddress, GuestMemory, GuestMemoryMmap, GuestUsize,
 };
 
+const E820_RAM: u32 = 1;
+
 // This is a workaround to the Rust enforcement specifying that any implementation of a foreign
 // trait (in this case `DataInit`) where:
 // *    the type that is implementing the trait is foreign or
@@ -198,13 +200,13 @@ fn add_e820_entry(
     size: u64,
     mem_type: u32,
 ) -> Result<(), Error> {
-    if params.e820_entries >= params.e820_map.len() as u8 {
+    if params.e820_entries >= params.e820_table.len() as u8 {
         return Err(Error::E820Configuration);
     }
 
-    params.e820_map[params.e820_entries as usize].addr = addr;
-    params.e820_map[params.e820_entries as usize].size = size;
-    params.e820_map[params.e820_entries as usize].type_ = mem_type;
+    params.e820_table[params.e820_entries as usize].addr = addr;
+    params.e820_table[params.e820_entries as usize].size = size;
+    params.e820_table[params.e820_entries as usize].type_ = mem_type;
     params.e820_entries += 1;
 
     Ok(())
@@ -213,7 +215,7 @@ fn add_e820_entry(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use linux_loader::loader::bootparam::e820entry;
+    use linux_loader::loader::bootparam::boot_e820_entry;
 
     #[test]
     fn regions_lt_4gb() {
@@ -290,14 +292,14 @@ mod tests {
 
     #[test]
     fn test_add_e820_entry() {
-        let e820_map = [(e820entry {
+        let e820_table = [(boot_e820_entry {
             addr: 0x1,
             size: 4,
             type_: 1,
         }); 128];
 
         let expected_params = boot_params {
-            e820_map,
+            e820_table,
             e820_entries: 1,
             ..Default::default()
         };
@@ -305,25 +307,25 @@ mod tests {
         let mut params: boot_params = Default::default();
         add_e820_entry(
             &mut params,
-            e820_map[0].addr,
-            e820_map[0].size,
-            e820_map[0].type_,
+            e820_table[0].addr,
+            e820_table[0].size,
+            e820_table[0].type_,
         )
         .unwrap();
         assert_eq!(
-            format!("{:?}", params.e820_map[0]),
-            format!("{:?}", expected_params.e820_map[0])
+            format!("{:?}", params.e820_table[0]),
+            format!("{:?}", expected_params.e820_table[0])
         );
         assert_eq!(params.e820_entries, expected_params.e820_entries);
 
         // Exercise the scenario where the field storing the length of the e820 entry table is
         // is bigger than the allocated memory.
-        params.e820_entries = params.e820_map.len() as u8 + 1;
+        params.e820_entries = params.e820_table.len() as u8 + 1;
         assert!(add_e820_entry(
             &mut params,
-            e820_map[0].addr,
-            e820_map[0].size,
-            e820_map[0].type_
+            e820_table[0].addr,
+            e820_table[0].size,
+            e820_table[0].type_
         )
         .is_err());
     }