mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

base: move mmap.remove_range to Unix trait

Browse source 
RESTRICT AUTOMERGE

BUG=b:162363783
TEST=./build_test

Change-Id: I851c38ce1fb84e28a6e391c61e56f2fb05cbf08f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2572740
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Michael Hoyle <mikehoyle@google.com>
This commit is contained in:
Michael Hoyle 2020-11-10 16:41:15 -08:00 committed by Commit Bot
parent 8e1d300613
commit bda802cf29
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
base/src/lib.rs
View file

@ -17,6 +17,7 @@ pub use event::{Event, EventReadResult, ScopedEvent};
pub use ioctl::{
ioctl, ioctl_with_mut_ptr, ioctl_with_mut_ref, ioctl_with_ptr, ioctl_with_ref, ioctl_with_val,
};
pub use mmap::Unix as MemoryMappingUnix;
pub use mmap::{MemoryMapping, MemoryMappingBuilder};
pub use shm::{SharedMemory, Unix as SharedMemoryUnix};
pub use sys_util::ioctl::*;

8
base/src/mmap.rs
View file

@ -53,8 +53,14 @@ impl MemoryMapping {
self.0
.write_from_memory(mem_offset, &wrap_descriptor(dst), count)
}
}
pub fn remove_range(&self, mem_offset: usize, count: usize) -> Result<()> {
pub trait Unix {
fn remove_range(&self, mem_offset: usize, count: usize) -> Result<()>;
}
impl Unix for MemoryMapping {
fn remove_range(&self, mem_offset: usize, count: usize) -> Result<()> {
self.0.remove_range(mem_offset, count)
}
}

4
vm_memory/src/guest_memory.rs
View file

@ -14,8 +14,8 @@ use std::sync::Arc;
use crate::guest_address::GuestAddress;
use base::{pagesize, Error as SysError};
use base::{
AsRawDescriptor, MappedRegion, MemfdSeals, MemoryMapping, MemoryMappingBuilder, MmapError,
RawDescriptor, SharedMemory, SharedMemoryUnix,
AsRawDescriptor, MappedRegion, MemfdSeals, MemoryMapping, MemoryMappingBuilder,
MemoryMappingUnix, MmapError, RawDescriptor, SharedMemory, SharedMemoryUnix,
};
use cros_async::{
uring_mem::{self, BorrowedIoVec},