diff options
Diffstat (limited to 'devices/src/virtio')
| -rw-r--r-- | devices/src/virtio/descriptor_utils.rs | 4 | ||||
| -rw-r--r-- | devices/src/virtio/wl.rs | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/devices/src/virtio/descriptor_utils.rs b/devices/src/virtio/descriptor_utils.rs index 5142ecf..0ea4faa 100644 --- a/devices/src/virtio/descriptor_utils.rs +++ b/devices/src/virtio/descriptor_utils.rs @@ -675,7 +675,7 @@ mod tests { let mut reader = Reader::new(&memory, chain); // GuestMemory's write_from_memory requires raw file descriptor. - let mut shm = SharedMemory::new(None).unwrap(); + let mut shm = SharedMemory::anon().unwrap(); shm.set_size(384).unwrap(); // Prevent shared memory from growing on `write` call. @@ -712,7 +712,7 @@ mod tests { let mut writer = Writer::new(&memory, chain); // GuestMemory's read_to_memory requires raw file descriptor. - let mut shm = SharedMemory::new(None).unwrap(); + let mut shm = SharedMemory::anon().unwrap(); shm.set_size(384).unwrap(); if let Ok(_) = writer.write_from(&shm, 512) { diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs index d40089b..e6d4f40 100644 --- a/devices/src/virtio/wl.rs +++ b/devices/src/virtio/wl.rs @@ -33,7 +33,6 @@ use std::collections::btree_map::Entry; use std::collections::{BTreeMap as Map, BTreeSet as Set, VecDeque}; use std::convert::From; use std::error::Error as StdError; -use std::ffi::CStr; use std::fmt::{self, Display}; use std::fs::File; use std::io::{self, Read, Seek, SeekFrom}; @@ -725,9 +724,7 @@ impl WlVfd { fn allocate(vm: VmRequester, size: u64) -> WlResult<WlVfd> { let size_page_aligned = round_up_to_page_size(size as usize) as u64; - let mut vfd_shm = - SharedMemory::new(Some(CStr::from_bytes_with_nul(b"virtwl_alloc\0").unwrap())) - .map_err(WlError::NewAlloc)?; + let mut vfd_shm = SharedMemory::named("virtwl_alloc").map_err(WlError::NewAlloc)?; vfd_shm .set_size(size_page_aligned) .map_err(WlError::AllocSetSize)?; |