upgrade to latest vm-memory (v0.6.0)

Tests were failing because of a breaking change in
GuestMemoryMmap interface. Fixed them and increased
the minimum version of vm-memory dependency.
Fixes #83.

Signed-off-by: Laura Loghin <lauralg@amazon.com>

Author: lauralt

Cargo.toml

@@ -18,11 +18,11 @@ elf = []
 pe = []
 
 [dependencies]
-vm-memory = ">=0.2.0"
+vm-memory = ">=0.6.0"
 
 [dev-dependencies]
 criterion = "=0.3.0"
-vm-memory = { version = ">=0.2.0", features = ["backend-mmap"] }
+vm-memory = { version = ">=0.6.0", features = ["backend-mmap"] }
 
 [[bench]]
 name = "main"

src/loader/aarch64/pe/mod.rs

@@ -202,7 +202,8 @@ where
 mod tests {
     use super::*;
     use std::io::Cursor;
-    use vm_memory::{Address, GuestAddress, GuestMemoryMmap};
+    use vm_memory::{Address, GuestAddress};
+    type GuestMemoryMmap = vm_memory::GuestMemoryMmap<()>;
 
     const MEM_SIZE: u64 = 0x100_0000;
 

src/loader/mod.rs

@@ -193,10 +193,11 @@ unsafe impl ByteValued for bootparam::boot_params {}
 /// # Examples
 ///
 /// ```rust
+/// # use std::ffi::CStr;
 /// # extern crate vm_memory;
 /// # use linux_loader::loader::*;
-/// # use vm_memory::{Bytes, GuestAddress, GuestMemoryMmap};
-/// # use std::ffi::CStr;
+/// # use vm_memory::{Bytes, GuestAddress};
+/// # type GuestMemoryMmap = vm_memory::GuestMemoryMmap<()>;
 /// let mem_size: usize = 0x1000000;
 /// let gm = GuestMemoryMmap::from_ranges(&[(GuestAddress(0x0), mem_size)]).unwrap();
 /// let mut cl = Cmdline::new(10);
@@ -233,7 +234,8 @@ pub fn load_cmdline<M: GuestMemory>(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use vm_memory::{Address, GuestAddress, GuestMemoryMmap};
+    use vm_memory::{Address, GuestAddress};
+    type GuestMemoryMmap = vm_memory::GuestMemoryMmap<()>;
 
     const MEM_SIZE: u64 = 0x100_0000;
 

src/loader/x86_64/bzimage/mod.rs

@@ -81,9 +81,10 @@ impl KernelLoader for BzImage {
     ///
     /// ```rust
     /// # extern crate vm_memory;
-    /// # use linux_loader::loader::*;
-    /// # use vm_memory::{Address, GuestAddress, GuestMemoryMmap};
     /// # use std::io::Cursor;
+    /// # use linux_loader::loader::*;
+    /// # use vm_memory::{Address, GuestAddress};
+    /// # type GuestMemoryMmap = vm_memory::GuestMemoryMmap<()>;
     /// let mem_size: usize = 0x1000000;
     /// let himem_start = GuestAddress(0x0);
     /// let kernel_addr = GuestAddress(0x200000);
@@ -189,7 +190,8 @@ mod tests {
     use std::fs::File;
     use std::io::Cursor;
     use std::process::Command;
-    use vm_memory::{Address, GuestAddress, GuestMemoryMmap};
+    use vm_memory::{Address, GuestAddress};
+    type GuestMemoryMmap = vm_memory::GuestMemoryMmap<()>;
 
     const MEM_SIZE: u64 = 0x100_0000;
 

src/loader/x86_64/elf/mod.rs

@@ -175,9 +175,10 @@ impl KernelLoader for Elf {
     ///
     /// ```rust
     /// # extern crate vm_memory;
-    /// # use linux_loader::loader::*;
-    /// # use vm_memory::{Address, GuestAddress, GuestMemoryMmap};
     /// # use std::io::Cursor;
+    /// # use linux_loader::loader::*;
+    /// # use vm_memory::{Address, GuestAddress};
+    /// # type GuestMemoryMmap = vm_memory::GuestMemoryMmap<()>;
     /// let mem_size: usize = 0x1000000;
     /// let himem_start = GuestAddress(0x0);
     /// let kernel_addr = GuestAddress(0x200000);
@@ -421,7 +422,8 @@ fn align_up(addr: u64, align: u64) -> result::Result<u64, Error> {
 mod tests {
     use super::*;
     use std::io::Cursor;
-    use vm_memory::{Address, GuestAddress, GuestMemoryMmap};
+    use vm_memory::{Address, GuestAddress};
+    type GuestMemoryMmap = vm_memory::GuestMemoryMmap<()>;
 
     const MEM_SIZE: u64 = 0x100_0000;