From 04a82c7be173b2068c4254ed4a129e24e9e3a2e4 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 24 Sep 2019 11:06:58 -0700 Subject: [PATCH] devices: vfio: fix clippy warnings Fix boxed_local, const_static_lifetime, useless_format, and redundant_closure clippy warnings in the VFIO code. This fixes all clippy warnings except a single instance of let_and_return in VfioPciDevice::keep_fds(), since that code is modified in an upcoming patch. BUG=None TEST=./build_test.py TEST=bin/clippy Change-Id: I548adbc6b92448fc0db82ed72214d73b0eabaf5c Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1822697 Reviewed-by: Xiong Zhang Reviewed-by: Zach Reizner Tested-by: Xiong Zhang Tested-by: kokoro --- devices/src/pci/vfio_pci.rs | 6 +++--- devices/src/vfio.rs | 6 +++--- src/linux.rs | 2 +- vfio_sys/src/vfio.rs | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/devices/src/pci/vfio_pci.rs b/devices/src/pci/vfio_pci.rs index 90733120c8..5b0474a25a 100644 --- a/devices/src/pci/vfio_pci.rs +++ b/devices/src/pci/vfio_pci.rs @@ -100,8 +100,8 @@ pub struct VfioPciDevice { impl VfioPciDevice { /// Constructs a new Vfio Pci device for the give Vfio device - pub fn new(device: Box) -> Self { - let dev = Arc::new(*device); + pub fn new(device: VfioDevice) -> Self { + let dev = Arc::new(device); let config = VfioPciConfig::new(Arc::clone(&dev)); VfioPciDevice { device: dev, @@ -131,7 +131,7 @@ impl VfioPciDevice { impl PciDevice for VfioPciDevice { fn debug_label(&self) -> String { - format!("vfio pci device") + "vfio pci device".to_string() } fn assign_bus_dev(&mut self, bus: u8, device: u8) { diff --git a/devices/src/vfio.rs b/devices/src/vfio.rs index c5d37176d7..966085fbf9 100644 --- a/devices/src/vfio.rs +++ b/devices/src/vfio.rs @@ -78,7 +78,7 @@ impl VfioContainer { .read(true) .write(true) .open("/dev/vfio/vfio") - .map_err(|e| VfioError::OpenContainer(e))?; + .map_err(VfioError::OpenContainer)?; Ok(VfioContainer { container }) } @@ -164,7 +164,7 @@ impl VfioGroup { .read(true) .write(true) .open(Path::new(&group_path)) - .map_err(|e| VfioError::OpenGroup(e))?; + .map_err(VfioError::OpenGroup)?; let mut group_status = vfio_group_status { argsz: mem::size_of::() as u32, @@ -217,7 +217,7 @@ impl VfioGroup { flags: 0, }; vm.create_device(&mut vfio_dev) - .map_err(|e| VfioError::CreateVfioKvmDevice(e))?; + .map_err(VfioError::CreateVfioKvmDevice)?; // Safe as we are the owner of vfio_dev.fd which is valid value. let vfio_dev_fd = unsafe { File::from_raw_fd(vfio_dev.fd as i32) }; diff --git a/src/linux.rs b/src/linux.rs index c7612401d6..6de02e9b77 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -990,7 +990,7 @@ fn create_devices( if cfg.vfio.is_some() { let vfio_path = cfg.vfio.as_ref().unwrap().as_path(); let vfiodevice = - Box::new(VfioDevice::new(vfio_path, vm, mem.clone()).map_err(Error::CreateVfioDevice)?); + VfioDevice::new(vfio_path, vm, mem.clone()).map_err(Error::CreateVfioDevice)?; let vfiopcidevice = Box::new(VfioPciDevice::new(vfiodevice)); pci_devices.push((vfiopcidevice, simple_jail(&cfg, "vfio_device.policy")?)); } diff --git a/vfio_sys/src/vfio.rs b/vfio_sys/src/vfio.rs index 45b4cc95bd..3b88848690 100644 --- a/vfio_sys/src/vfio.rs +++ b/vfio_sys/src/vfio.rs @@ -81,10 +81,10 @@ pub const VFIO_DEVICE_FLAGS_PCI: u32 = 2; pub const VFIO_DEVICE_FLAGS_PLATFORM: u32 = 4; pub const VFIO_DEVICE_FLAGS_AMBA: u32 = 8; pub const VFIO_DEVICE_FLAGS_CCW: u32 = 16; -pub const VFIO_DEVICE_API_PCI_STRING: &'static [u8; 9usize] = b"vfio-pci\0"; -pub const VFIO_DEVICE_API_PLATFORM_STRING: &'static [u8; 14usize] = b"vfio-platform\0"; -pub const VFIO_DEVICE_API_AMBA_STRING: &'static [u8; 10usize] = b"vfio-amba\0"; -pub const VFIO_DEVICE_API_CCW_STRING: &'static [u8; 9usize] = b"vfio-ccw\0"; +pub const VFIO_DEVICE_API_PCI_STRING: &[u8; 9usize] = b"vfio-pci\0"; +pub const VFIO_DEVICE_API_PLATFORM_STRING: &[u8; 14usize] = b"vfio-platform\0"; +pub const VFIO_DEVICE_API_AMBA_STRING: &[u8; 10usize] = b"vfio-amba\0"; +pub const VFIO_DEVICE_API_CCW_STRING: &[u8; 9usize] = b"vfio-ccw\0"; pub const VFIO_REGION_INFO_FLAG_READ: u32 = 1; pub const VFIO_REGION_INFO_FLAG_WRITE: u32 = 2; pub const VFIO_REGION_INFO_FLAG_MMAP: u32 = 4;