diff options
| author | Daniel Prilik <prilik@google.com> | 2019-02-27 12:24:25 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-25 17:43:50 -0700 |
| commit | db4721d8709a7d139f9b6cb405b22e2a405072ff (patch) | |
| tree | ff21f5766937b8b8333d894adc19c9a5faf08293 /kvm | |
| parent | 33e8ef061d4a0d263edd6542728ac4bec3ebf42f (diff) | |
| download | crosvm-db4721d8709a7d139f9b6cb405b22e2a405072ff.tar crosvm-db4721d8709a7d139f9b6cb405b22e2a405072ff.tar.gz crosvm-db4721d8709a7d139f9b6cb405b22e2a405072ff.tar.bz2 crosvm-db4721d8709a7d139f9b6cb405b22e2a405072ff.tar.lz crosvm-db4721d8709a7d139f9b6cb405b22e2a405072ff.tar.xz crosvm-db4721d8709a7d139f9b6cb405b22e2a405072ff.tar.zst crosvm-db4721d8709a7d139f9b6cb405b22e2a405072ff.zip | |
crosvm: add memfd for GuestMemory
Building off CL:1290293 Instead of having a seperate GuestMemoryManager, this adds SharedMemory as a Arc'd member of GuestMemory. This is nice since it removes the need to plumb the Manager struct throughout the codebase. BUG=chromium:936567 TEST=cargo test -p sys_util Change-Id: I6fa5d73f7e0db495c2803a040479818445660345 Reviewed-on: https://chromium-review.googlesource.com/1493013 Commit-Ready: Daniel Prilik <prilik@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'kvm')
| -rw-r--r-- | kvm/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kvm/src/lib.rs b/kvm/src/lib.rs index 3112fa0..42ed400 100644 --- a/kvm/src/lib.rs +++ b/kvm/src/lib.rs @@ -312,7 +312,7 @@ impl Vm { if ret >= 0 { // Safe because we verify the value of ret and we are the owners of the fd. let vm_file = unsafe { File::from_raw_fd(ret) }; - guest_mem.with_regions(|index, guest_addr, size, host_addr| { + guest_mem.with_regions(|index, guest_addr, size, host_addr, _| { unsafe { // Safe because the guest regions are guaranteed not to overlap. set_user_memory_region( |