From f6cd3bd86ded632da437b6dd6077f4237d2f71fe Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 29 Apr 2024 03:47:15 +0000 Subject: [PATCH] block, pci, rate_limiter, vm-allocator: drop legacy numeric constants Signed-off-by: Wei Liu --- block/src/qcow/mod.rs | 2 +- pci/src/bus.rs | 4 ++-- pci/src/configuration.rs | 4 ++-- pci/src/vfio_user.rs | 1 - rate_limiter/src/group.rs | 4 ++-- rate_limiter/src/lib.rs | 8 ++++---- vm-allocator/src/address.rs | 5 +---- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/block/src/qcow/mod.rs b/block/src/qcow/mod.rs index cf18d64ab..27bc02e44 100644 --- a/block/src/qcow/mod.rs +++ b/block/src/qcow/mod.rs @@ -1631,7 +1631,7 @@ impl PunchHole for QcowFile { let mut remaining = length; let mut offset = offset; while remaining > 0 { - let chunk_length = min(remaining, std::usize::MAX as u64) as usize; + let chunk_length = min(remaining, usize::MAX as u64) as usize; self.deallocate_bytes(offset, chunk_length)?; remaining -= chunk_length as u64; offset += chunk_length as u64; diff --git a/pci/src/bus.rs b/pci/src/bus.rs index ecaea6086..a809fbc22 100644 --- a/pci/src/bus.rs +++ b/pci/src/bus.rs @@ -409,7 +409,7 @@ impl BusDevice for PciConfigMmio { // Only allow reads to the register boundary. let start = offset as usize % 4; let end = start + data.len(); - if end > 4 || offset > u64::from(u32::max_value()) { + if end > 4 || offset > u64::from(u32::MAX) { for d in data { *d = 0xff; } @@ -423,7 +423,7 @@ impl BusDevice for PciConfigMmio { } fn write(&mut self, _base: u64, offset: u64, data: &[u8]) -> Option> { - if offset > u64::from(u32::max_value()) { + if offset > u64::from(u32::MAX) { return None; } self.config_space_write(offset as u32, offset % 4, data); diff --git a/pci/src/configuration.rs b/pci/src/configuration.rs index a12fb75e3..1717d8c92 100644 --- a/pci/src/configuration.rs +++ b/pci/src/configuration.rs @@ -743,7 +743,7 @@ impl PciConfiguration { .ok_or(Error::BarAddressInvalid(config.addr, config.size))?; match config.region_type { PciBarRegionType::Memory32BitRegion | PciBarRegionType::IoRegion => { - if end_addr > u64::from(u32::max_value()) { + if end_addr > u64::from(u32::MAX) { return Err(Error::BarAddressInvalid(config.addr, config.size)); } @@ -814,7 +814,7 @@ impl PciConfiguration { .checked_add(config.size - 1) .ok_or(Error::RomBarAddressInvalid(config.addr, config.size))?; - if end_addr > u64::from(u32::max_value()) { + if end_addr > u64::from(u32::MAX) { return Err(Error::RomBarAddressInvalid(config.addr, config.size)); } diff --git a/pci/src/vfio_user.rs b/pci/src/vfio_user.rs index da4048ac1..b6bd2f2d4 100644 --- a/pci/src/vfio_user.rs +++ b/pci/src/vfio_user.rs @@ -11,7 +11,6 @@ use std::any::Any; use std::os::unix::prelude::AsRawFd; use std::ptr::null_mut; use std::sync::{Arc, Barrier, Mutex}; -use std::u32; use thiserror::Error; use vfio_bindings::bindings::vfio::*; use vfio_ioctls::VfioIrq; diff --git a/rate_limiter/src/group.rs b/rate_limiter/src/group.rs index 24c775141..af4ad4c4f 100644 --- a/rate_limiter/src/group.rs +++ b/rate_limiter/src/group.rs @@ -367,7 +367,7 @@ pub(crate) mod tests { assert!(h.as_raw_fd() > 0); // ops/s limiter should be disabled so consume(whatever) should work - assert!(h.consume(u64::max_value(), TokenType::Ops)); + assert!(h.consume(u64::MAX, TokenType::Ops)); // do full 1000 bytes assert!(h.consume(1000, TokenType::Bytes)); @@ -403,7 +403,7 @@ pub(crate) mod tests { assert!(h.as_raw_fd() > 0); // bytes/s limiter should be disabled so consume(whatever) should work - assert!(h.consume(u64::max_value(), TokenType::Bytes)); + assert!(h.consume(u64::MAX, TokenType::Bytes)); // do full 1000 ops assert!(h.consume(1000, TokenType::Ops)); diff --git a/rate_limiter/src/lib.rs b/rate_limiter/src/lib.rs index 793b3f474..ca79d5bd5 100644 --- a/rate_limiter/src/lib.rs +++ b/rate_limiter/src/lib.rs @@ -662,8 +662,8 @@ pub(crate) mod tests { // limiter should not be blocked assert!(!l.is_blocked()); // limiter should be disabled so consume(whatever) should work - assert!(l.consume(u64::max_value(), TokenType::Ops)); - assert!(l.consume(u64::max_value(), TokenType::Bytes)); + assert!(l.consume(u64::MAX, TokenType::Ops)); + assert!(l.consume(u64::MAX, TokenType::Bytes)); // calling the handler without there having been an event should error assert!(l.event_handler().is_err()); assert_eq!( @@ -721,7 +721,7 @@ pub(crate) mod tests { assert!(l.as_raw_fd() > 0); // ops/s limiter should be disabled so consume(whatever) should work - assert!(l.consume(u64::max_value(), TokenType::Ops)); + assert!(l.consume(u64::MAX, TokenType::Ops)); // do full 1000 bytes assert!(l.consume(1000, TokenType::Bytes)); @@ -754,7 +754,7 @@ pub(crate) mod tests { assert!(l.as_raw_fd() > 0); // bytes/s limiter should be disabled so consume(whatever) should work - assert!(l.consume(u64::max_value(), TokenType::Bytes)); + assert!(l.consume(u64::MAX, TokenType::Bytes)); // do full 1000 ops assert!(l.consume(1000, TokenType::Ops)); diff --git a/vm-allocator/src/address.rs b/vm-allocator/src/address.rs index 73c1b6c8c..b48de714f 100644 --- a/vm-allocator/src/address.rs +++ b/vm-allocator/src/address.rs @@ -219,10 +219,7 @@ mod tests { #[test] fn new_fails_overflow() { - assert_eq!( - AddressAllocator::new(GuestAddress(u64::max_value()), 0x100), - None - ); + assert_eq!(AddressAllocator::new(GuestAddress(u64::MAX), 0x100), None); } #[test]