From aa34d545f6107c8773878523714da5a597fec0bd Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Thu, 25 Mar 2021 16:54:09 +0000 Subject: [PATCH] vm-virtio, virtio-devices: Address Rust 1.51.0 clippy issue (upper_case_acronyms) error: name `TYPE_UNKNOWN` contains a capitalized acronym --> vm-virtio/src/lib.rs:48:5 | 48 | TYPE_UNKNOWN = 0xFF, | ^^^^^^^^^^^^ help: consider making the acronym lowercase, except the initial letter: `Type_Unknown` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#upper_case_acronyms Signed-off-by: Rob Bradford --- virtio-devices/src/balloon.rs | 2 +- virtio-devices/src/block.rs | 2 +- virtio-devices/src/console.rs | 2 +- virtio-devices/src/iommu.rs | 2 +- virtio-devices/src/mem.rs | 2 +- virtio-devices/src/net.rs | 2 +- virtio-devices/src/pmem.rs | 2 +- virtio-devices/src/rng.rs | 2 +- virtio-devices/src/transport/pci_device.rs | 4 +- virtio-devices/src/vhost_user/blk.rs | 2 +- virtio-devices/src/vhost_user/fs.rs | 2 +- virtio-devices/src/vhost_user/net.rs | 2 +- virtio-devices/src/vsock/device.rs | 7 +- virtio-devices/src/watchdog.rs | 2 +- vm-virtio/src/lib.rs | 90 +++++++++++----------- vmm/src/device_manager.rs | 10 +-- 16 files changed, 66 insertions(+), 69 deletions(-) diff --git a/virtio-devices/src/balloon.rs b/virtio-devices/src/balloon.rs index a52ab1bb1..6a9db34a7 100644 --- a/virtio-devices/src/balloon.rs +++ b/virtio-devices/src/balloon.rs @@ -328,7 +328,7 @@ impl Balloon { Ok(Balloon { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_BALLOON as u32, + device_type: VirtioDeviceType::Balloon as u32, avail_features, paused_sync: Some(Arc::new(Barrier::new(2))), queue_sizes: QUEUE_SIZES.to_vec(), diff --git a/virtio-devices/src/block.rs b/virtio-devices/src/block.rs index 29139122a..37b21e410 100644 --- a/virtio-devices/src/block.rs +++ b/virtio-devices/src/block.rs @@ -430,7 +430,7 @@ impl Block { Ok(Block { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_BLOCK as u32, + device_type: VirtioDeviceType::Block as u32, avail_features, paused_sync: Some(Arc::new(Barrier::new(num_queues + 1))), queue_sizes: vec![queue_size; num_queues], diff --git a/virtio-devices/src/console.rs b/virtio-devices/src/console.rs index f964a4410..cf7d29f58 100644 --- a/virtio-devices/src/console.rs +++ b/virtio-devices/src/console.rs @@ -344,7 +344,7 @@ impl Console { Ok(( Console { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_CONSOLE as u32, + device_type: VirtioDeviceType::Console as u32, queue_sizes: QUEUE_SIZES.to_vec(), avail_features, paused_sync: Some(Arc::new(Barrier::new(2))), diff --git a/virtio-devices/src/iommu.rs b/virtio-devices/src/iommu.rs index 631e26120..b81379867 100644 --- a/virtio-devices/src/iommu.rs +++ b/virtio-devices/src/iommu.rs @@ -769,7 +769,7 @@ impl Iommu { Iommu { id, common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_IOMMU as u32, + device_type: VirtioDeviceType::Iommu as u32, queue_sizes: QUEUE_SIZES.to_vec(), avail_features: 1u64 << VIRTIO_F_VERSION_1 | 1u64 << VIRTIO_IOMMU_F_MAP_UNMAP diff --git a/virtio-devices/src/mem.rs b/virtio-devices/src/mem.rs index 7d15a598d..01fe3b249 100644 --- a/virtio-devices/src/mem.rs +++ b/virtio-devices/src/mem.rs @@ -816,7 +816,7 @@ impl Mem { Ok(Mem { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_MEM as u32, + device_type: VirtioDeviceType::Mem as u32, avail_features, paused_sync: Some(Arc::new(Barrier::new(2))), queue_sizes: QUEUE_SIZES.to_vec(), diff --git a/virtio-devices/src/net.rs b/virtio-devices/src/net.rs index da1b9c517..3a97c9fd1 100644 --- a/virtio-devices/src/net.rs +++ b/virtio-devices/src/net.rs @@ -251,7 +251,7 @@ impl Net { Ok(Net { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_NET as u32, + device_type: VirtioDeviceType::Net as u32, avail_features, queue_sizes: vec![queue_size; queue_num], paused_sync: Some(Arc::new(Barrier::new((num_queues / 2) + 1))), diff --git a/virtio-devices/src/pmem.rs b/virtio-devices/src/pmem.rs index 042964115..020c84e4d 100644 --- a/virtio-devices/src/pmem.rs +++ b/virtio-devices/src/pmem.rs @@ -300,7 +300,7 @@ impl Pmem { Ok(Pmem { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_PMEM as u32, + device_type: VirtioDeviceType::Pmem as u32, queue_sizes: QUEUE_SIZES.to_vec(), paused_sync: Some(Arc::new(Barrier::new(2))), avail_features, diff --git a/virtio-devices/src/rng.rs b/virtio-devices/src/rng.rs index 77e246a6e..4fcd90153 100644 --- a/virtio-devices/src/rng.rs +++ b/virtio-devices/src/rng.rs @@ -154,7 +154,7 @@ impl Rng { Ok(Rng { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_RNG as u32, + device_type: VirtioDeviceType::Rng as u32, queue_sizes: QUEUE_SIZES.to_vec(), paused_sync: Some(Arc::new(Barrier::new(2))), avail_features, diff --git a/virtio-devices/src/transport/pci_device.rs b/virtio-devices/src/transport/pci_device.rs index 9492671a6..8b71003a5 100644 --- a/virtio-devices/src/transport/pci_device.rs +++ b/virtio-devices/src/transport/pci_device.rs @@ -384,11 +384,11 @@ impl VirtioPciDevice { // to firmware without requiring excessive identity mapping. let mut use_64bit_bar = true; let (class, subclass) = match VirtioDeviceType::from(locked_device.device_type()) { - VirtioDeviceType::TYPE_NET => ( + VirtioDeviceType::Net => ( PciClassCode::NetworkController, &PciNetworkControllerSubclass::EthernetController as &dyn PciSubclass, ), - VirtioDeviceType::TYPE_BLOCK => { + VirtioDeviceType::Block => { use_64bit_bar = false; ( PciClassCode::MassStorage, diff --git a/virtio-devices/src/vhost_user/blk.rs b/virtio-devices/src/vhost_user/blk.rs index 3a402ded5..36bd79cdd 100644 --- a/virtio-devices/src/vhost_user/blk.rs +++ b/virtio-devices/src/vhost_user/blk.rs @@ -139,7 +139,7 @@ impl Blk { Ok(Blk { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_BLOCK as u32, + device_type: VirtioDeviceType::Block as u32, queue_sizes: vec![vu_cfg.queue_size; vu_cfg.num_queues], avail_features, acked_features, diff --git a/virtio-devices/src/vhost_user/fs.rs b/virtio-devices/src/vhost_user/fs.rs index 89be3d13c..2f8040fe7 100644 --- a/virtio-devices/src/vhost_user/fs.rs +++ b/virtio-devices/src/vhost_user/fs.rs @@ -356,7 +356,7 @@ impl Fs { Ok(Fs { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_FS as u32, + device_type: VirtioDeviceType::Fs as u32, avail_features, acked_features, queue_sizes: vec![queue_size; num_queues], diff --git a/virtio-devices/src/vhost_user/net.rs b/virtio-devices/src/vhost_user/net.rs index 4038821d3..b65570d1f 100644 --- a/virtio-devices/src/vhost_user/net.rs +++ b/virtio-devices/src/vhost_user/net.rs @@ -151,7 +151,7 @@ impl Net { Ok(Net { id, common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_NET as u32, + device_type: VirtioDeviceType::Net as u32, queue_sizes: vec![vu_cfg.queue_size; queue_num], avail_features, acked_features, diff --git a/virtio-devices/src/vsock/device.rs b/virtio-devices/src/vsock/device.rs index 675821476..3521bd545 100644 --- a/virtio-devices/src/vsock/device.rs +++ b/virtio-devices/src/vsock/device.rs @@ -333,7 +333,7 @@ where Ok(Vsock { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_VSOCK as u32, + device_type: VirtioDeviceType::Vsock as u32, avail_features, paused_sync: Some(Arc::new(Barrier::new(2))), queue_sizes: QUEUE_SIZES.to_vec(), @@ -566,10 +566,7 @@ mod tests { (driver_features & 0xffff_ffff) as u32, (driver_features >> 32) as u32, ]; - assert_eq!( - ctx.device.device_type(), - VirtioDeviceType::TYPE_VSOCK as u32 - ); + assert_eq!(ctx.device.device_type(), VirtioDeviceType::Vsock as u32); assert_eq!(ctx.device.queue_max_sizes(), QUEUE_SIZES); assert_eq!(ctx.device.features() as u32, device_pages[0]); assert_eq!((ctx.device.features() >> 32) as u32, device_pages[1]); diff --git a/virtio-devices/src/watchdog.rs b/virtio-devices/src/watchdog.rs index 10626d20f..45ddbb79c 100644 --- a/virtio-devices/src/watchdog.rs +++ b/virtio-devices/src/watchdog.rs @@ -189,7 +189,7 @@ impl Watchdog { let timer = unsafe { File::from_raw_fd(timer_fd) }; Ok(Watchdog { common: VirtioCommon { - device_type: VirtioDeviceType::TYPE_WATCHDOG as u32, + device_type: VirtioDeviceType::Watchdog as u32, queue_sizes: QUEUE_SIZES.to_vec(), paused_sync: Some(Arc::new(Barrier::new(2))), avail_features, diff --git a/vm-virtio/src/lib.rs b/vm-virtio/src/lib.rs index 756ec2307..7ea405750 100644 --- a/vm-virtio/src/lib.rs +++ b/vm-virtio/src/lib.rs @@ -31,41 +31,41 @@ pub const VIRTIO_MSI_NO_VECTOR: u16 = 0xffff; #[allow(non_camel_case_types)] #[repr(C)] pub enum VirtioDeviceType { - TYPE_NET = 1, - TYPE_BLOCK = 2, - TYPE_CONSOLE = 3, - TYPE_RNG = 4, - TYPE_BALLOON = 5, - TYPE_9P = 9, - TYPE_GPU = 16, - TYPE_INPUT = 18, - TYPE_VSOCK = 19, - TYPE_IOMMU = 23, - TYPE_MEM = 24, - TYPE_FS = 26, - TYPE_PMEM = 27, - TYPE_WATCHDOG = 35, // Temporary until official number allocated - TYPE_UNKNOWN = 0xFF, + Net = 1, + Block = 2, + Console = 3, + Rng = 4, + Balloon = 5, + Fs9P = 9, + Gpu = 16, + Input = 18, + Vsock = 19, + Iommu = 23, + Mem = 24, + Fs = 26, + Pmem = 27, + Watchdog = 35, // Temporary until official number allocated + Unknown = 0xFF, } impl From for VirtioDeviceType { fn from(t: u32) -> Self { match t { - 1 => VirtioDeviceType::TYPE_NET, - 2 => VirtioDeviceType::TYPE_BLOCK, - 3 => VirtioDeviceType::TYPE_CONSOLE, - 4 => VirtioDeviceType::TYPE_RNG, - 5 => VirtioDeviceType::TYPE_BALLOON, - 9 => VirtioDeviceType::TYPE_9P, - 16 => VirtioDeviceType::TYPE_GPU, - 18 => VirtioDeviceType::TYPE_INPUT, - 19 => VirtioDeviceType::TYPE_VSOCK, - 23 => VirtioDeviceType::TYPE_IOMMU, - 24 => VirtioDeviceType::TYPE_MEM, - 26 => VirtioDeviceType::TYPE_FS, - 27 => VirtioDeviceType::TYPE_PMEM, - 35 => VirtioDeviceType::TYPE_WATCHDOG, - _ => VirtioDeviceType::TYPE_UNKNOWN, + 1 => VirtioDeviceType::Net, + 2 => VirtioDeviceType::Block, + 3 => VirtioDeviceType::Console, + 4 => VirtioDeviceType::Rng, + 5 => VirtioDeviceType::Balloon, + 9 => VirtioDeviceType::Fs9P, + 16 => VirtioDeviceType::Gpu, + 18 => VirtioDeviceType::Input, + 19 => VirtioDeviceType::Vsock, + 23 => VirtioDeviceType::Iommu, + 24 => VirtioDeviceType::Mem, + 26 => VirtioDeviceType::Fs, + 27 => VirtioDeviceType::Pmem, + 35 => VirtioDeviceType::Watchdog, + _ => VirtioDeviceType::Unknown, } } } @@ -76,21 +76,21 @@ impl fmt::Display for VirtioDeviceType { // This trait requires `fmt` with this exact signature. fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let output = match *self { - VirtioDeviceType::TYPE_NET => "net", - VirtioDeviceType::TYPE_BLOCK => "block", - VirtioDeviceType::TYPE_CONSOLE => "console", - VirtioDeviceType::TYPE_RNG => "rng", - VirtioDeviceType::TYPE_BALLOON => "balloon", - VirtioDeviceType::TYPE_GPU => "gpu", - VirtioDeviceType::TYPE_9P => "9p", - VirtioDeviceType::TYPE_INPUT => "input", - VirtioDeviceType::TYPE_VSOCK => "vsock", - VirtioDeviceType::TYPE_IOMMU => "iommu", - VirtioDeviceType::TYPE_MEM => "mem", - VirtioDeviceType::TYPE_FS => "fs", - VirtioDeviceType::TYPE_PMEM => "pmem", - VirtioDeviceType::TYPE_WATCHDOG => "watchdog", - VirtioDeviceType::TYPE_UNKNOWN => "UNKNOWN", + VirtioDeviceType::Net => "net", + VirtioDeviceType::Block => "block", + VirtioDeviceType::Console => "console", + VirtioDeviceType::Rng => "rng", + VirtioDeviceType::Balloon => "balloon", + VirtioDeviceType::Gpu => "gpu", + VirtioDeviceType::Fs9P => "9p", + VirtioDeviceType::Input => "input", + VirtioDeviceType::Vsock => "vsock", + VirtioDeviceType::Iommu => "iommu", + VirtioDeviceType::Mem => "mem", + VirtioDeviceType::Fs => "fs", + VirtioDeviceType::Pmem => "pmem", + VirtioDeviceType::Watchdog => "watchdog", + VirtioDeviceType::Unknown => "UNKNOWN", }; write!(f, "{}", output) } diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index 7222ef9bd..2c70ae5eb 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -3283,11 +3283,11 @@ impl DeviceManager { .device_type(), ); match device_type { - VirtioDeviceType::TYPE_NET - | VirtioDeviceType::TYPE_BLOCK - | VirtioDeviceType::TYPE_PMEM - | VirtioDeviceType::TYPE_FS - | VirtioDeviceType::TYPE_VSOCK => {} + VirtioDeviceType::Net + | VirtioDeviceType::Block + | VirtioDeviceType::Pmem + | VirtioDeviceType::Fs + | VirtioDeviceType::Vsock => {} _ => return Err(DeviceManagerError::RemovalNotAllowed(device_type)), } }