diff options
author | Gurchetan Singh <gurchetansingh@chromium.org> | 2020-05-21 18:05:06 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-06-12 05:00:37 +0000 |
commit | 173fe62df2b82f4d09a36066200f0a1727bd1d22 (patch) | |
tree | c3c0588afebd0b43811b3631c1d94168ba72c420 /arch/src/pstore.rs | |
parent | 4ffb3d06bdadcfcb79ee2b7bf445ac09da34c218 (diff) | |
download | crosvm-173fe62df2b82f4d09a36066200f0a1727bd1d22.tar crosvm-173fe62df2b82f4d09a36066200f0a1727bd1d22.tar.gz crosvm-173fe62df2b82f4d09a36066200f0a1727bd1d22.tar.bz2 crosvm-173fe62df2b82f4d09a36066200f0a1727bd1d22.tar.lz crosvm-173fe62df2b82f4d09a36066200f0a1727bd1d22.tar.xz crosvm-173fe62df2b82f4d09a36066200f0a1727bd1d22.tar.zst crosvm-173fe62df2b82f4d09a36066200f0a1727bd1d22.zip |
kvm: use MappedRegion trait
- Reduces code duplication between MMIO and mmap arenas - Makes adding future types easier - Makes upcoming deprecation of kvm crate easier - Use BTreeMap instead of HashMap since it's more efficient BUG=chromium:924405 TEST=compile and test Change-Id: I520abed0926489e64aac046e0dc0cfeb72fae7b2 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2216446 Tested-by: Gurchetan Singh <gurchetansingh@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org> Reviewed-by: Steven Richman <srichman@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Auto-Submit: Gurchetan Singh <gurchetansingh@chromium.org>
Diffstat (limited to 'arch/src/pstore.rs')
-rw-r--r-- | arch/src/pstore.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/src/pstore.rs b/arch/src/pstore.rs index a06ea1b..a6c5e61 100644 --- a/arch/src/pstore.rs +++ b/arch/src/pstore.rs @@ -64,8 +64,13 @@ pub fn create_memory_region( let memory_mapping = MemoryMapping::from_fd(&file, pstore.size as usize).map_err(Error::MmapError)?; - vm.add_mmio_memory(GuestAddress(address), memory_mapping, false, false) - .map_err(Error::SysUtilError)?; + vm.add_memory_region( + GuestAddress(address), + Box::new(memory_mapping), + false, + false, + ) + .map_err(Error::SysUtilError)?; Ok(RamoopsRegion { address, |