Preserve backward-compatibility

Signed-off-by: Michael Jarrett <[email protected]>

Author: EmeraldShift

src/mmap.rs

@@ -458,14 +458,19 @@ impl GuestMemoryMmap {
     ///
     /// Valid memory regions are specified as a sequence of (Address, Size, Option<FileOffset>)
     /// tuples sorted by Address.
-    pub fn from_ranges_with_files<A, T>(
-        ranges: &[(GuestAddress, usize, Option<FileOffset>)],
-    ) -> result::Result<Self, Error> {
-        Self::from_ranges_with_options(
-            ranges
-                .iter()
-                .map(|r| (r.0, r.1, PageSizePolicy::BasePages, r.2.clone())),
-        )
+    pub fn from_ranges_with_files<A, T>(ranges: T) -> result::Result<Self, Error>
+    where
+        A: Borrow<(GuestAddress, usize, Option<FileOffset>)>,
+        T: IntoIterator<Item = A>,
+    {
+        Self::from_ranges_with_options(ranges.into_iter().map(|r| {
+            (
+                r.borrow().0,
+                r.borrow().1,
+                PageSizePolicy::BasePages,
+                r.borrow().2.clone(),
+            )
+        }))
     }
 
     /// Creates a container and allocates anonymous memory for guest memory regions.
@@ -486,9 +491,9 @@ impl GuestMemoryMmap {
                     let policy = x.borrow().2;
 
                     if let Some(ref f_off) = x.borrow().3 {
-                        MmapRegion::from_file(f_off.clone(), size, policy)
+                        MmapRegion::from_file_with_policy(f_off.clone(), size, policy)
                     } else {
-                        MmapRegion::new(size, policy)
+                        MmapRegion::with_policy(size, policy)
                     }
                     .map_err(Error::MmapRegion)
                     .and_then(|r| GuestRegionMmap::new(r, guest_base))

src/mmap_unix.rs

@@ -105,7 +105,16 @@ impl MmapRegion {
     ///
     /// # Arguments
     /// * `size` - The size of the memory region in bytes.
-    pub fn new(size: usize, policy: PageSizePolicy) -> Result<Self> {
+    pub fn new(size: usize) -> Result<Self> {
+        Self::with_policy(size, PageSizePolicy::BasePages)
+    }
+
+    /// Creates a shared anonymous mapping of `size` bytes.
+    ///
+    /// # Arguments
+    /// * `size` - The size of the memory region in bytes.
+    /// * `policy` - The page size policy of the memory region.
+    pub fn with_policy(size: usize, policy: PageSizePolicy) -> Result<Self> {
         Self::build(
             None,
             size,
@@ -121,7 +130,22 @@ impl MmapRegion {
     /// * `file_offset` - The mapping will be created at offset `file_offset.start` in the file
     ///                   referred to by `file_offset.file`.
     /// * `size` - The size of the memory region in bytes.
-    pub fn from_file(file_offset: FileOffset, size: usize, policy: PageSizePolicy) -> Result<Self> {
+    pub fn from_file(file_offset: FileOffset, size: usize) -> Result<Self> {
+        Self::from_file_with_policy(file_offset, size, PageSizePolicy::BasePages)
+    }
+
+    /// Creates a shared file mapping of `size` bytes.
+    ///
+    /// # Arguments
+    /// * `file_offset` - The mapping will be created at offset `file_offset.start` in the file
+    ///                   referred to by `file_offset.file`.
+    /// * `size` - The size of the memory region in bytes.
+    /// * `policy` - The page size policy of the memory region.
+    pub fn from_file_with_policy(
+        file_offset: FileOffset,
+        size: usize,
+        policy: PageSizePolicy,
+    ) -> Result<Self> {
         Self::build(
             Some(file_offset),
             size,
@@ -412,6 +436,7 @@ mod tests {
             size,
             prot,
             flags,
+            PageSizePolicy::BasePages,
         );
         assert_eq!(format!("{:?}", r.unwrap_err()), "InvalidOffsetLength");
 
@@ -421,6 +446,7 @@ mod tests {
             size,
             prot,
             flags,
+            PageSizePolicy::BasePages,
         );
         assert_eq!(format!("{:?}", r.unwrap_err()), "MappingPastEof");
 
@@ -430,6 +456,7 @@ mod tests {
             size,
             prot,
             flags | libc::MAP_FIXED,
+            PageSizePolicy::BasePages,
         );
         assert_eq!(format!("{:?}", r.unwrap_err()), "MapFixed");
 
@@ -442,6 +469,7 @@ mod tests {
             size,
             prot,
             flags,
+            PageSizePolicy::BasePages,
         );
         assert_eq!(r.unwrap_err().raw_os_error(), libc::EINVAL);
 
@@ -451,6 +479,7 @@ mod tests {
             size,
             prot,
             flags,
+            PageSizePolicy::BasePages,
         )
         .unwrap();
 

src/mmap_windows.rs

@@ -84,12 +84,20 @@ unsafe impl Send for MmapRegion {}
 unsafe impl Sync for MmapRegion {}
 
 impl MmapRegion {
+    /// Creates a shared anonymous mapping of `size` bytes.
+    ///
+    /// # Arguments
+    /// * `size` - The size of the memory region in bytes.
+    pub fn new(size: usize) -> io::Result<Self> {
+        Self::with_policy(size, PageSizePolicy::BasePages)
+    }
+
     /// Creates a shared anonymous mapping of `size` bytes.
     ///
     /// # Arguments
     /// * `size` - The size of the memory region in bytes.
     /// * `policy` - Unimplemented on Windows platforms.
-    pub fn new(size: usize, _policy: PageSizePolicy) -> io::Result<Self> {
+    pub fn with_policy(size: usize, _policy: PageSizePolicy) -> io::Result<Self> {
         if (size == 0) || (size > MM_HIGHEST_VAD_ADDRESS as usize) {
             return Err(io::Error::from_raw_os_error(libc::EINVAL));
         }
@@ -106,14 +114,24 @@ impl MmapRegion {
         })
     }
 
+    /// Creates a shared file mapping of `size` bytes.
+    ///
+    /// # Arguments
+    /// * `file_offset` - The mapping will be created at offset `file_offset.start` in the file
+    ///                   referred to by `file_offset.file`.
+    /// * `size` - The size of the memory region in bytes.
+    pub fn from_file(file_offset: FileOffset, size: usize) -> io::Result<Self> {
+        Self::from_file_with_policy(file_offset, size, PageSizePolicy::BasePages)
+    }
+
     /// Creates a shared file mapping of `size` bytes.
     ///
     /// # Arguments
     /// * `file_offset` - The mapping will be created at offset `file_offset.start` in the file
     ///                   referred to by `file_offset.file`.
     /// * `size` - The size of the memory region in bytes.
     /// * `policy` - Unimplemented on Windows platforms.
-    pub fn from_file(
+    pub fn from_file_with_policy(
         file_offset: FileOffset,
         size: usize,
         _policy: PageSizePolicy,