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 /devices/src/virtio | |
| 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 'devices/src/virtio')
| -rw-r--r-- | devices/src/virtio/vhost/net.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devices/src/virtio/vhost/net.rs b/devices/src/virtio/vhost/net.rs index b8e518d..2ecef9d 100644 --- a/devices/src/virtio/vhost/net.rs +++ b/devices/src/virtio/vhost/net.rs @@ -227,8 +227,8 @@ pub mod tests { fn create_guest_memory() -> result::Result<GuestMemory, GuestMemoryError> { let start_addr1 = GuestAddress(0x0); - let start_addr2 = GuestAddress(0x100); - GuestMemory::new(&vec![(start_addr1, 0x100), (start_addr2, 0x400)]) + let start_addr2 = GuestAddress(0x1000); + GuestMemory::new(&vec![(start_addr1, 0x1000), (start_addr2, 0x4000)]) } fn create_net_common() -> Net<FakeTap, FakeNet<FakeTap>> { |