use `SharedMemory::{named, anon}` to replace `::new`

The new constructors are shorter and omit the bare `None` in the `anon`
call sites which gave no clues to the reader what the effect of that
`None` was. This should improve readability.

TEST=./build_test
BUG=None

Change-Id: I2e34e7df9a4ccc5da50edf4e963a6a42e3d84b22
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1797188
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>

12 files changed, 18 insertions, 26 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)?;
diff --git a/fuzz/block_fuzzer.rs b/fuzz/block_fuzzer.rs
index 6e5d983..6dd3cf2 100644
--- a/fuzz/block_fuzzer.rs
+++ b/fuzz/block_fuzzer.rs
@@ -89,7 +89,7 @@ pub fn test_one_input(data: *const u8, size: usize) -> i32 {
         let queue_fd = queue_evts[0].as_raw_fd();
         let queue_evt = unsafe { EventFd::from_raw_fd(libc::dup(queue_fd)) };
 
-        let shm = SharedMemory::new(None).unwrap();
+        let shm = SharedMemory::anon().unwrap();
         let disk_file: File = shm.into();
         let mut block = Block::new(Box::new(disk_file), false, None).unwrap();
 
diff --git a/fuzz/qcow_fuzzer.rs b/fuzz/qcow_fuzzer.rs
index e6175ff..f76e5d0 100644
--- a/fuzz/qcow_fuzzer.rs
+++ b/fuzz/qcow_fuzzer.rs
@@ -31,7 +31,7 @@ pub fn test_one_input(data: *const u8, size: usize) -> i32 {
         let mut disk_image = Cursor::new(bytes);
         let addr = read_u64(&mut disk_image);
         let value = read_u64(&mut disk_image);
-        let shm = SharedMemory::new(None).unwrap();
+        let shm = SharedMemory::anon().unwrap();
         let mut disk_file: File = shm.into();
         disk_file.write_all(&bytes[16..]).unwrap();
         disk_file.seek(SeekFrom::Start(0)).unwrap();
diff --git a/fuzz/zimage_fuzzer.rs b/fuzz/zimage_fuzzer.rs
index b0ee523..0cc41cf 100644
--- a/fuzz/zimage_fuzzer.rs
+++ b/fuzz/zimage_fuzzer.rs
@@ -15,7 +15,7 @@ use std::slice;
 const MEM_SIZE: u64 = 256 * 1024 * 1024;
 
 fn make_elf_bin(elf_bytes: &[u8]) -> File {
-    let mut shm = SharedMemory::new(None).expect("failed to create shared memory");
+    let mut shm = SharedMemory::anon().expect("failed to create shared memory");
     shm.set_size(elf_bytes.len() as u64)
         .expect("failed to set shared memory size");
     shm.write_all(elf_bytes)
diff --git a/gpu_display/src/gpu_display_wl.rs b/gpu_display/src/gpu_display_wl.rs
index 670c429..3e1fe92 100644
--- a/gpu_display/src/gpu_display_wl.rs
+++ b/gpu_display/src/gpu_display_wl.rs
@@ -204,10 +204,8 @@ impl DisplayT for DisplayWl {
         let row_size = width * BYTES_PER_PIXEL;
         let fb_size = row_size * height;
         let buffer_size = round_up_to_page_size(fb_size as usize * BUFFER_COUNT);
-        let mut buffer_shm = SharedMemory::new(Some(
-            CStr::from_bytes_with_nul(b"GpuDisplaySurface\0").unwrap(),
-        ))
-        .map_err(GpuDisplayError::CreateShm)?;
+        let mut buffer_shm =
+            SharedMemory::named("GpuDisplaySurface").map_err(GpuDisplayError::CreateShm)?;
         buffer_shm
             .set_size(buffer_size as u64)
             .map_err(GpuDisplayError::SetSize)?;
diff --git a/kernel_loader/src/lib.rs b/kernel_loader/src/lib.rs
index 75828f5..d878d06 100644
--- a/kernel_loader/src/lib.rs
+++ b/kernel_loader/src/lib.rs
@@ -232,7 +232,7 @@ mod test {
     // Elf64 image that prints hello world on x86_64.
     fn make_elf_bin() -> File {
         let elf_bytes = include_bytes!("test_elf.bin");
-        let mut shm = SharedMemory::new(None).expect("failed to create shared memory");
+        let mut shm = SharedMemory::anon().expect("failed to create shared memory");
         shm.set_size(elf_bytes.len() as u64)
             .expect("failed to set shared memory size");
         shm.write_all(elf_bytes)
diff --git a/kvm/tests/dirty_log.rs b/kvm/tests/dirty_log.rs
index 4efb208..8d8e56d 100644
--- a/kvm/tests/dirty_log.rs
+++ b/kvm/tests/dirty_log.rs
@@ -18,7 +18,7 @@ fn test_run() {
     let mem_size = 0x10000;
     let load_addr = GuestAddress(0x1000);
     let guest_mem = GuestMemory::new(&[]).unwrap();
-    let mut mem = SharedMemory::new(None).expect("failed to create shared memory");
+    let mut mem = SharedMemory::anon().expect("failed to create shared memory");
     mem.set_size(mem_size)
         .expect("failed to set shared memory size");
     let mmap =
diff --git a/kvm/tests/read_only_memory.rs b/kvm/tests/read_only_memory.rs
index c1dd854..54f0acd 100644
--- a/kvm/tests/read_only_memory.rs
+++ b/kvm/tests/read_only_memory.rs
@@ -20,7 +20,7 @@ fn test_run() {
     let mem_size = 0x2000;
     let load_addr = GuestAddress(0x1000);
     let guest_mem = GuestMemory::new(&[]).unwrap();
-    let mut mem = SharedMemory::new(None).expect("failed to create shared memory");
+    let mut mem = SharedMemory::anon().expect("failed to create shared memory");
     mem.set_size(mem_size)
         .expect("failed to set shared memory size");
     let mmap =
@@ -55,7 +55,7 @@ fn test_run() {
 
     // Give some read only memory for the test code to read from and force a vcpu exit when it reads
     // from it.
-    let mut mem_ro = SharedMemory::new(None).expect("failed to create shared memory");
+    let mut mem_ro = SharedMemory::anon().expect("failed to create shared memory");
     mem_ro
         .set_size(0x1000)
         .expect("failed to set shared memory size");
diff --git a/qcow/src/qcow.rs b/qcow/src/qcow.rs
index 3153df1..aaff5f1 100644
--- a/qcow/src/qcow.rs
+++ b/qcow/src/qcow.rs
@@ -1646,7 +1646,7 @@ mod tests {
     where
         F: FnMut(File),
     {
-        let shm = SharedMemory::new(None).unwrap();
+        let shm = SharedMemory::anon().unwrap();
         let mut disk_file: File = shm.into();
         disk_file.write_all(&header).unwrap();
         disk_file.set_len(0x1_0000_0000).unwrap();
@@ -1659,7 +1659,7 @@ mod tests {
     where
         F: FnMut(QcowFile),
     {
-        let shm = SharedMemory::new(None).unwrap();
+        let shm = SharedMemory::anon().unwrap();
         let qcow_file = QcowFile::new(shm.into(), file_size).unwrap();
 
         testfn(qcow_file); // File closed when the function exits.
@@ -1668,7 +1668,7 @@ mod tests {
     #[test]
     fn default_header() {
         let header = QcowHeader::create_for_size(0x10_0000);
-        let shm = SharedMemory::new(None).unwrap();
+        let shm = SharedMemory::anon().unwrap();
         let mut disk_file: File = shm.into();
         header
             .write_to(&mut disk_file)
diff --git a/sys_util/src/guest_memory.rs b/sys_util/src/guest_memory.rs
index c3ea816..ac7722e 100644
--- a/sys_util/src/guest_memory.rs
+++ b/sys_util/src/guest_memory.rs
@@ -4,7 +4,6 @@
 
 //! Track memory regions that are mapped to the guest VM.
 
-use std::ffi::CStr;
 use std::fmt::{self, Display};
 use std::os::unix::io::{AsRawFd, RawFd};
 use std::result;
@@ -118,9 +117,7 @@ impl GuestMemory {
         seals.set_grow_seal();
         seals.set_seal_seal();
 
-        let mut memfd =
-            SharedMemory::new(Some(CStr::from_bytes_with_nul(b"crosvm_guest\0").unwrap()))
-                .map_err(Error::MemoryCreationFailed)?;
+        let mut memfd = SharedMemory::named("crosvm_guest").map_err(Error::MemoryCreationFailed)?;
         memfd
             .set_size(aligned_size)
             .map_err(Error::MemorySetSizeFailed)?;
diff --git a/tests/plugins.rs b/tests/plugins.rs
index ec094d1..50abea8 100644
--- a/tests/plugins.rs
+++ b/tests/plugins.rs
@@ -135,13 +135,13 @@ fn keep_fd_on_exec<F: AsRawFd>(f: &F) {
 /// Takes assembly source code and returns the resulting assembly code.
 fn build_assembly(src: &str) -> Vec<u8> {
     // Creates a shared memory region with the assembly source code in it.
-    let in_shm = SharedMemory::new(None).unwrap();
+    let in_shm = SharedMemory::anon().unwrap();
     let mut in_shm_file: File = in_shm.into();
     keep_fd_on_exec(&in_shm_file);
     in_shm_file.write_all(src.as_bytes()).unwrap();
 
     // Creates a shared memory region that will hold the nasm output.
-    let mut out_shm_file: File = SharedMemory::new(None).unwrap().into();
+    let mut out_shm_file: File = SharedMemory::anon().unwrap().into();
     keep_fd_on_exec(&out_shm_file);
 
     // Runs nasm with the input and output files set to the FDs of the above shared memory regions,