From 7c359d617f82361d03910a07ab54e17f07a54b23 Mon Sep 17 00:00:00 2001 From: Steven Richman Date: Wed, 13 May 2020 23:05:58 -0700 Subject: hypervisor: add Vm user memory region functions The separate Vm functions for MemoryMappings and MemoryMappingArenas have been combined and now use a MappedRegion trait that the mappings implement. msync_memory_region replaces the get_mmap_arena function, which is used by VmMsyncRequest. Since Vm uses mutexes for cloning, it can't return mem region references. BUG=chromium:1077058 TEST=cargo test, cargo test -p sys_util, cargo test -p hypervisor Change-Id: If257b16ee34d07820ae7ebdb9a3a598a41df013c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2202845 Reviewed-by: Daniel Verkamp Reviewed-by: Gurchetan Singh Tested-by: kokoro Commit-Queue: Gurchetan Singh --- devices/src/pci/vfio_pci.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devices') diff --git a/devices/src/pci/vfio_pci.rs b/devices/src/pci/vfio_pci.rs index 7b5c233..fa27dec 100644 --- a/devices/src/pci/vfio_pci.rs +++ b/devices/src/pci/vfio_pci.rs @@ -9,7 +9,7 @@ use std::u32; use kvm::Datamatch; use msg_socket::{MsgReceiver, MsgSender}; use resources::{Alloc, MmioType, SystemAllocator}; -use sys_util::{error, EventFd, MemoryMapping}; +use sys_util::{error, EventFd, MappedRegion, MemoryMapping}; use vfio_sys::*; use vm_control::{ -- cgit 1.4.1