mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Clippy or_fun_call warnings in devices/

Browse source 
BUG=chromium:1111728
TEST=cargo clippy -- -A clippy::all -W clippy::or_fun_call passes under
devices directory

Change-Id: I4c9e079df98b50e55a5489cd925fb7b621caf4dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2587191
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: Camilo Jacomet <cjacomet@google.com>
Commit-Queue: Camilo Jacomet <cjacomet@google.com>
This commit is contained in:
Camilo Jacomet 2020-12-11 18:17:10 +00:00 committed by Commit Bot
parent 48d1729e2f
commit a9bfcb485c
5 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
devices/src/virtio/wl.rs
View file

@ -758,8 +758,8 @@ impl WlVfd {
self.guest_shared_memory
.as_ref()
.map(|(_, shm)| shm.as_raw_descriptor())
.or(self.socket.as_ref().map(|s| s.as_raw_descriptor()))
.or(self.remote_pipe.as_ref().map(|p| p.as_raw_descriptor()))
.or_else(|| self.socket.as_ref().map(|s| s.as_raw_descriptor()))
.or_else(|| self.remote_pipe.as_ref().map(|p| p.as_raw_descriptor()))
}
// The FD that is used for polling for events on this VFD.
@ -767,10 +767,11 @@ impl WlVfd {
self.socket
.as_ref()
.map(|s| s as &dyn AsRawDescriptor)
.or(self
.local_pipe
.or_else(|| {
self.local_pipe
.as_ref()
.map(|(_, p)| p as &dyn AsRawDescriptor))
.map(|(_, p)| p as &dyn AsRawDescriptor)
})
}
// Sends data/files from the guest to the host over this VFD.
@ -1032,7 +1033,7 @@ impl WlState {
&self
.wayland_paths
.get(name)
.ok_or(WlError::UnknownSocketName(name.to_string()))?,
.ok_or_else(|| WlError::UnknownSocketName(name.to_string()))?,
)?);
self.wait_ctx
.add(vfd.wait_descriptor().unwrap(), id)

6
disk/src/android_sparse.rs
View file

@ -285,10 +285,12 @@ impl FileReadWriteAtVolatile for AndroidSparse {
chunk,
expanded_size,
},
) = found_chunk.ok_or(io::Error::new(
) = found_chunk.ok_or_else(|| {
io::Error::new(
ErrorKind::UnexpectedEof,
format!("no chunk for offset {}", offset),
))?;
)
})?;
let chunk_offset = offset - chunk_start;
let chunk_size = *expanded_size;
let subslice = if chunk_offset + (slice.size() as u64) > chunk_size {

8
disk/src/qcow/mod.rs
View file

@ -1011,7 +1011,7 @@ impl QcowFile {
let l2_addr_disk = *self
.l1_table
.get(l1_index)
.ok_or(std::io::Error::from_raw_os_error(EINVAL))?;
.ok_or_else(|| std::io::Error::from_raw_os_error(EINVAL))?;
if l2_addr_disk == 0 {
// Reading from an unallocated cluster will return zeros.
@ -1054,7 +1054,7 @@ impl QcowFile {
let l2_addr_disk = *self
.l1_table
.get(l1_index)
.ok_or(std::io::Error::from_raw_os_error(EINVAL))?;
.ok_or_else(|| std::io::Error::from_raw_os_error(EINVAL))?;
let l2_index = self.l2_table_index(address) as usize;
let mut set_refcounts = Vec::new();
@ -1188,7 +1188,7 @@ impl QcowFile {
let l2_addr_disk = *self
.l1_table
.get(l1_index)
.ok_or(std::io::Error::from_raw_os_error(EINVAL))?;
.ok_or_else(|| std::io::Error::from_raw_os_error(EINVAL))?;
let l2_index = self.l2_table_index(address) as usize;
if l2_addr_disk == 0 {
@ -1260,7 +1260,7 @@ impl QcowFile {
let l2_addr_disk = *self
.l1_table
.get(l1_index)
.ok_or(std::io::Error::from_raw_os_error(EINVAL))?;
.ok_or_else(|| std::io::Error::from_raw_os_error(EINVAL))?;
let l2_index = self.l2_table_index(address) as usize;
if l2_addr_disk == 0 {

8
hypervisor/src/kvm/mod.rs
View file

@ -416,7 +416,9 @@ impl Vm for KvmVm {
log_dirty_pages: bool,
) -> Result<MemSlot> {
let size = mem.size() as u64;
let end_addr = guest_addr.checked_add(size).ok_or(Error::new(EOVERFLOW))?;
let end_addr = guest_addr
.checked_add(size)
.ok_or_else(|| Error::new(EOVERFLOW))?;
if self.guest_mem.range_overlap(guest_addr, end_addr) {
return Err(Error::new(ENOSPC));
}
@ -453,7 +455,7 @@ impl Vm for KvmVm {
fn msync_memory_region(&mut self, slot: MemSlot, offset: usize, size: usize) -> Result<()> {
let mut regions = self.mem_regions.lock();
let mem = regions.get_mut(&slot).ok_or(Error::new(ENOENT))?;
let mem = regions.get_mut(&slot).ok_or_else(|| Error::new(ENOENT))?;
mem.msync(offset, size).map_err(|err| match err {
MmapError::InvalidAddress => Error::new(EFAULT),
@ -507,7 +509,7 @@ impl Vm for KvmVm {
fn get_dirty_log(&self, slot: MemSlot, dirty_log: &mut [u8]) -> Result<()> {
let regions = self.mem_regions.lock();
let mmap = regions.get(&slot).ok_or(Error::new(ENOENT))?;
let mmap = regions.get(&slot).ok_or_else(|| Error::new(ENOENT))?;
// Ensures that there are as many bytes in dirty_log as there are pages in the mmap.
if dirty_log_bitmap_size(mmap.size()) > dirty_log.len() {
return Err(Error::new(EINVAL));

2
vm_control/src/lib.rs
View file

@ -363,7 +363,7 @@ impl VmMemoryRequest {
let mem = map_request
.lock()
.take()
.ok_or(VmMemoryResponse::Err(SysError::new(EINVAL)))
.ok_or_else(|| VmMemoryResponse::Err(SysError::new(EINVAL)))
.unwrap();
match register_memory_hva(vm, sys_allocator, Box::new(mem), (alloc, offset)) {