summary refs log tree commit diff
path: root/src/linux.rs
diff options
context:
space:
mode:
authorGurchetan Singh <gurchetansingh@chromium.org>2020-05-21 18:05:06 -0700
committerCommit Bot <commit-bot@chromium.org>2020-06-12 05:00:37 +0000
commit173fe62df2b82f4d09a36066200f0a1727bd1d22 (patch)
treec3c0588afebd0b43811b3631c1d94168ba72c420 /src/linux.rs
parent4ffb3d06bdadcfcb79ee2b7bf445ac09da34c218 (diff)
downloadcrosvm-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 'src/linux.rs')
-rw-r--r--src/linux.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/linux.rs b/src/linux.rs
index fb463c2..687aae4 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -1012,9 +1012,9 @@ fn create_pmem_device(
         .map_err(Error::AllocatePmemDeviceAddress)?;
 
     let slot = vm
-        .add_mmap_arena(
+        .add_memory_region(
             GuestAddress(mapping_address),
-            arena,
+            Box::new(arena),
             /* read_only = */ disk.read_only,
             /* log_dirty_pages = */ false,
         )