From 173fe62df2b82f4d09a36066200f0a1727bd1d22 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Thu, 21 May 2020 18:05:06 -0700 Subject: 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 Tested-by: kokoro Commit-Queue: Gurchetan Singh Reviewed-by: Steven Richman Reviewed-by: Daniel Verkamp Auto-Submit: Gurchetan Singh --- kvm/tests/read_only_memory.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'kvm/tests/read_only_memory.rs') diff --git a/kvm/tests/read_only_memory.rs b/kvm/tests/read_only_memory.rs index d8c0e1d..36ba1b2 100644 --- a/kvm/tests/read_only_memory.rs +++ b/kvm/tests/read_only_memory.rs @@ -45,9 +45,12 @@ fn test_run() { vcpu_regs.rax = 0x66; vcpu_regs.rbx = 0; vcpu.set_regs(&vcpu_regs).expect("set regs failed"); - vm.add_mmio_memory( + vm.add_memory_region( GuestAddress(0), - MemoryMapping::from_fd(&mem, mem_size as usize).expect("failed to create memory mapping"), + Box::new( + MemoryMapping::from_fd(&mem, mem_size as usize) + .expect("failed to create memory mapping"), + ), false, false, ) @@ -63,9 +66,9 @@ fn test_run() { mmap_ro .write_obj(vcpu_regs.rax as u8, 0) .expect("failed writing data to ro memory"); - vm.add_mmio_memory( + vm.add_memory_region( GuestAddress(vcpu_sregs.es.base), - MemoryMapping::from_fd(&mem_ro, 0x1000).expect("failed to create memory mapping"), + Box::new(MemoryMapping::from_fd(&mem_ro, 0x1000).expect("failed to create memory mapping")), true, false, ) -- cgit 1.4.1