From 2716bc3311356510658ea12dd7de2548d52bfcbf Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Thu, 30 Jun 2022 16:41:46 +0100 Subject: [PATCH] build: Fix beta clippy issue (derive_partial_eq_without_eq) warning: you are deriving `PartialEq` and can implement `Eq` --> vmm/src/serial_manager.rs:59:30 | 59 | #[derive(Debug, Clone, Copy, PartialEq)] | ^^^^^^^^^ help: consider deriving `Eq` as well: `PartialEq, Eq` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#derive_partial_eq_without_eq Signed-off-by: Rob Bradford --- arch/src/lib.rs | 2 +- block_util/src/lib.rs | 2 +- hypervisor/src/arch/x86/emulator/mod.rs | 2 +- hypervisor/src/kvm/mod.rs | 2 +- net_util/src/mac.rs | 2 +- pci/src/configuration.rs | 4 +- pci/src/lib.rs | 2 +- rate_limiter/src/lib.rs | 2 +- tests/integration.rs | 2 +- vfio_user/src/lib.rs | 2 +- virtio-devices/src/lib.rs | 4 +- virtio-devices/src/pmem.rs | 2 +- virtio-devices/src/vsock/csm/mod.rs | 4 +- vm-device/src/bus.rs | 2 +- vm-device/src/lib.rs | 4 +- vm-migration/src/protocol.rs | 2 +- vmm/src/config.rs | 62 ++++++++++++------------- vmm/src/lib.rs | 2 +- vmm/src/serial_manager.rs | 2 +- vmm/src/vm.rs | 2 +- 20 files changed, 54 insertions(+), 54 deletions(-) diff --git a/arch/src/lib.rs b/arch/src/lib.rs index 1d9d26d23..001c7e7d7 100644 --- a/arch/src/lib.rs +++ b/arch/src/lib.rs @@ -54,7 +54,7 @@ pub enum Error { pub type Result = result::Result; /// Type for memory region types. -#[derive(Clone, Copy, PartialEq, Debug, Serialize, Deserialize, Versionize)] +#[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, Versionize)] pub enum RegionType { /// RAM type Ram, diff --git a/block_util/src/lib.rs b/block_util/src/lib.rs index 3a14b4fe8..36d59ba69 100644 --- a/block_util/src/lib.rs +++ b/block_util/src/lib.rs @@ -138,7 +138,7 @@ impl ExecuteError { } } -#[derive(Clone, Copy, Debug, PartialEq)] +#[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum RequestType { In, Out, diff --git a/hypervisor/src/arch/x86/emulator/mod.rs b/hypervisor/src/arch/x86/emulator/mod.rs index 7666504c7..51bc08679 100644 --- a/hypervisor/src/arch/x86/emulator/mod.rs +++ b/hypervisor/src/arch/x86/emulator/mod.rs @@ -16,7 +16,7 @@ use iced_x86::*; mod instructions; /// x86 CPU modes -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Eq)] pub enum CpuMode { /// Real mode Real, diff --git a/hypervisor/src/kvm/mod.rs b/hypervisor/src/kvm/mod.rs index 39da7ceae..07d486856 100644 --- a/hypervisor/src/kvm/mod.rs +++ b/hypervisor/src/kvm/mod.rs @@ -160,7 +160,7 @@ pub struct TdxCapabilities { pub cpuid_configs: [TdxCpuidConfig; TDX_MAX_NR_CPUID_CONFIGS], } -#[derive(Clone, Copy, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct KvmVmState {} pub use KvmVmState as VmState; diff --git a/net_util/src/mac.rs b/net_util/src/mac.rs index 823272858..b0dcfe409 100644 --- a/net_util/src/mac.rs +++ b/net_util/src/mac.rs @@ -15,7 +15,7 @@ use serde::ser::{Serialize, Serializer}; pub const MAC_ADDR_LEN: usize = 6; -#[derive(Clone, Copy, Debug, PartialEq)] +#[derive(Clone, Copy, Debug, PartialEq, Eq)] pub struct MacAddr { bytes: [u8; MAC_ADDR_LEN], } diff --git a/pci/src/configuration.rs b/pci/src/configuration.rs index 60051a9a6..d98834ef4 100644 --- a/pci/src/configuration.rs +++ b/pci/src/configuration.rs @@ -187,7 +187,7 @@ pub trait PciProgrammingInterface { } /// Types of PCI capabilities. -#[derive(PartialEq, Copy, Clone)] +#[derive(PartialEq, Eq, Copy, Clone)] #[allow(dead_code)] #[allow(non_camel_case_types)] #[repr(C)] @@ -321,7 +321,7 @@ pub struct PciConfiguration { } /// See pci_regs.h in kernel -#[derive(Copy, Clone, PartialEq, Versionize, Debug)] +#[derive(Copy, Clone, PartialEq, Eq, Versionize, Debug)] pub enum PciBarRegionType { Memory32BitRegion = 0, IoRegion = 0x01, diff --git a/pci/src/lib.rs b/pci/src/lib.rs index 45403ff24..df8dee927 100644 --- a/pci/src/lib.rs +++ b/pci/src/lib.rs @@ -52,7 +52,7 @@ pub const PCI_CONFIG_IO_PORT: u64 = 0xcf8; #[cfg(target_arch = "x86_64")] pub const PCI_CONFIG_IO_PORT_SIZE: u64 = 0x8; -#[derive(Clone, Copy, PartialEq, PartialOrd)] +#[derive(Clone, Copy, PartialEq, Eq, PartialOrd)] pub struct PciBdf(u32); struct PciBdfVisitor; diff --git a/rate_limiter/src/lib.rs b/rate_limiter/src/lib.rs index 6e0f2db11..858220c90 100644 --- a/rate_limiter/src/lib.rs +++ b/rate_limiter/src/lib.rs @@ -91,7 +91,7 @@ pub enum BucketReduction { /// TokenBucket provides a lower level interface to rate limiting with a /// configurable capacity, refill-rate and initial burst. -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct TokenBucket { // Bucket defining traits. size: u64, diff --git a/tests/integration.rs b/tests/integration.rs index 411884a1f..aff9e8c93 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -1614,7 +1614,7 @@ fn process_rss_kib(pid: u32) -> usize { // 10MB is our maximum accepted overhead. const MAXIMUM_VMM_OVERHEAD_KB: u32 = 10 * 1024; -#[derive(PartialEq, PartialOrd)] +#[derive(PartialEq, Eq, PartialOrd)] struct Counters { rx_bytes: u64, rx_frames: u64, diff --git a/vfio_user/src/lib.rs b/vfio_user/src/lib.rs index 8e21927d7..c46334236 100644 --- a/vfio_user/src/lib.rs +++ b/vfio_user/src/lib.rs @@ -51,7 +51,7 @@ impl Default for Command { #[allow(dead_code)] #[repr(u32)] -#[derive(Clone, Copy, Debug, PartialEq)] +#[derive(Clone, Copy, Debug, PartialEq, Eq)] enum HeaderFlags { Command = 0, Reply = 1, diff --git a/virtio-devices/src/lib.rs b/virtio-devices/src/lib.rs index d25b61222..e8c357c51 100644 --- a/virtio-devices/src/lib.rs +++ b/virtio-devices/src/lib.rs @@ -123,14 +123,14 @@ pub enum Error { QueueIterator(virtio_queue::Error), } -#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq)] +#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq, Eq)] pub struct TokenBucketConfig { pub size: u64, pub one_time_burst: Option, pub refill_time: u64, } -#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq)] +#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq, Eq)] #[serde(deny_unknown_fields)] pub struct RateLimiterConfig { pub bandwidth: Option, diff --git a/virtio-devices/src/pmem.rs b/virtio-devices/src/pmem.rs index 9834f89ab..0cb7b0282 100644 --- a/virtio-devices/src/pmem.rs +++ b/virtio-devices/src/pmem.rs @@ -106,7 +106,7 @@ impl Display for Error { } } -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Eq)] enum RequestType { Flush, } diff --git a/virtio-devices/src/vsock/csm/mod.rs b/virtio-devices/src/vsock/csm/mod.rs index b103d3f70..d61920ff5 100644 --- a/virtio-devices/src/vsock/csm/mod.rs +++ b/virtio-devices/src/vsock/csm/mod.rs @@ -38,7 +38,7 @@ type Result = std::result::Result; /// A vsock connection state. /// -#[derive(Clone, Copy, Debug, PartialEq)] +#[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum ConnState { /// The connection has been initiated by the host end, but is yet to be confirmed by the guest. LocalInit, @@ -61,7 +61,7 @@ pub enum ConnState { /// (via `notify()`), the connection will store a `PendingRx::Rw` to be later inspected by /// `recv_pkt()`. /// -#[derive(Clone, Copy, PartialEq)] +#[derive(Clone, Copy, PartialEq, Eq)] enum PendingRx { /// We need to yield a connection request packet (VSOCK_OP_REQUEST). Request = 0, diff --git a/vm-device/src/bus.rs b/vm-device/src/bus.rs index 47e7d2c0b..09784bbfc 100644 --- a/vm-device/src/bus.rs +++ b/vm-device/src/bus.rs @@ -7,7 +7,7 @@ //! Handles routing to devices in an address space. -use std::cmp::{Ord, Ordering, PartialEq, PartialOrd}; +use std::cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd}; use std::collections::btree_map::BTreeMap; use std::sync::{Arc, Barrier, Mutex, RwLock, Weak}; use std::{convert, error, fmt, io, result}; diff --git a/vm-device/src/lib.rs b/vm-device/src/lib.rs index c25adb69b..c16d0ec4e 100644 --- a/vm-device/src/lib.rs +++ b/vm-device/src/lib.rs @@ -12,7 +12,7 @@ pub mod interrupt; pub use self::bus::{Bus, BusDevice, Error as BusError}; /// Type of Message Signalled Interrupt -#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] +#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub enum MsiIrqType { /// PCI MSI IRQ numbers. PciMsi, @@ -22,7 +22,7 @@ pub enum MsiIrqType { GenericMsi, } -#[derive(Copy, Clone, PartialEq, Serialize, Deserialize, Debug)] +#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)] pub enum PciBarType { Io, Mmio32, diff --git a/vm-migration/src/protocol.rs b/vm-migration/src/protocol.rs index 898caec4f..765d04e31 100644 --- a/vm-migration/src/protocol.rs +++ b/vm-migration/src/protocol.rs @@ -139,7 +139,7 @@ impl Request { } #[repr(u16)] -#[derive(Copy, Clone, PartialEq)] +#[derive(Copy, Clone, PartialEq, Eq)] pub enum Status { Invalid, Ok, diff --git a/vmm/src/config.rs b/vmm/src/config.rs index e3af173ec..e88d8ae5d 100644 --- a/vmm/src/config.rs +++ b/vmm/src/config.rs @@ -113,7 +113,7 @@ pub enum Error { ParseVdpaPathMissing, } -#[derive(Debug, PartialEq, Error)] +#[derive(Debug, PartialEq, Eq, Error)] pub enum ValidationError { /// Both console and serial are tty. DoubleTtyMode, @@ -430,7 +430,7 @@ impl<'a> VmParams<'a> { } } -#[derive(Clone, Copy, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)] pub enum HotplugMethod { Acpi, VirtioMem, @@ -459,13 +459,13 @@ impl FromStr for HotplugMethod { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct CpuAffinity { pub vcpu: u8, pub host_cpus: Vec, } -#[derive(Clone, Debug, Default, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, Default, PartialEq, Eq, Deserialize, Serialize)] pub struct CpuFeatures { #[cfg(all(feature = "amx", target_arch = "x86_64"))] pub amx: bool, @@ -475,7 +475,7 @@ pub enum CpuTopologyParseError { InvalidValue(String), } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct CpuTopology { pub threads_per_core: u8, pub cores_per_die: u8, @@ -516,7 +516,7 @@ fn default_cpuconfig_max_phys_bits() -> u8 { DEFAULT_MAX_PHYS_BITS } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct CpusConfig { pub boot_vcpus: u8, pub max_vcpus: u8, @@ -626,7 +626,7 @@ fn default_platformconfig_num_pci_segments() -> u16 { DEFAULT_NUM_PCI_SEGMENTS } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct PlatformConfig { #[serde(default = "default_platformconfig_num_pci_segments")] pub num_pci_segments: u16, @@ -691,7 +691,7 @@ impl Default for PlatformConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct MemoryZoneConfig { pub id: String, pub size: u64, @@ -713,7 +713,7 @@ pub struct MemoryZoneConfig { pub prefault: bool, } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct MemoryConfig { pub size: u64, #[serde(default)] @@ -918,17 +918,17 @@ impl Default for MemoryConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct KernelConfig { pub path: PathBuf, } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct InitramfsConfig { pub path: PathBuf, } -#[derive(Clone, Debug, Default, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, Default, PartialEq, Eq, Deserialize, Serialize)] pub struct CmdlineConfig { pub args: String, } @@ -943,7 +943,7 @@ impl CmdlineConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct DiskConfig { pub path: Option, #[serde(default)] @@ -1178,7 +1178,7 @@ impl DiskConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub enum VhostMode { Client, Server, @@ -1207,7 +1207,7 @@ impl FromStr for VhostMode { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct NetConfig { #[serde(default = "default_netconfig_tap")] pub tap: Option, @@ -1478,7 +1478,7 @@ impl NetConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct RngConfig { pub src: PathBuf, #[serde(default)] @@ -1515,7 +1515,7 @@ impl Default for RngConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct BalloonConfig { pub size: u64, /// Option to deflate the balloon in case the guest is out of memory. @@ -1564,7 +1564,7 @@ impl BalloonConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct FsConfig { pub tag: String, pub socket: PathBuf, @@ -1667,7 +1667,7 @@ impl FsConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)] pub struct PmemConfig { pub file: PathBuf, #[serde(default)] @@ -1745,7 +1745,7 @@ impl PmemConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub enum ConsoleOutputMode { Off, Pty, @@ -1754,7 +1754,7 @@ pub enum ConsoleOutputMode { Null, } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct ConsoleConfig { #[serde(default = "default_consoleconfig_file")] pub file: Option, @@ -1824,7 +1824,7 @@ impl ConsoleConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)] pub struct DeviceConfig { pub path: PathBuf, #[serde(default)] @@ -1883,7 +1883,7 @@ impl DeviceConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)] pub struct UserDeviceConfig { pub socket: PathBuf, #[serde(default)] @@ -1936,7 +1936,7 @@ impl UserDeviceConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)] pub struct VdpaConfig { pub path: PathBuf, #[serde(default = "default_vdpaconfig_num_queues")] @@ -2012,7 +2012,7 @@ impl VdpaConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)] pub struct VsockConfig { pub cid: u64, pub socket: PathBuf, @@ -2083,7 +2083,7 @@ impl VsockConfig { } #[cfg(feature = "tdx")] -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)] pub struct TdxConfig { pub firmware: PathBuf, } @@ -2103,7 +2103,7 @@ impl TdxConfig { } #[cfg(target_arch = "x86_64")] -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)] pub struct SgxEpcConfig { pub id: String, #[serde(default)] @@ -2137,7 +2137,7 @@ impl SgxEpcConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)] pub struct NumaDistance { #[serde(default)] pub destination: u32, @@ -2145,7 +2145,7 @@ pub struct NumaDistance { pub distance: u8, } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)] pub struct NumaConfig { #[serde(default)] pub guest_numa_id: u32, @@ -2214,7 +2214,7 @@ impl NumaConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)] pub struct RestoreConfig { pub source_url: PathBuf, #[serde(default)] @@ -2248,7 +2248,7 @@ impl RestoreConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct VmConfig { #[serde(default)] pub cpus: CpusConfig, diff --git a/vmm/src/lib.rs b/vmm/src/lib.rs index ee337a19d..0447ceb91 100644 --- a/vmm/src/lib.rs +++ b/vmm/src/lib.rs @@ -164,7 +164,7 @@ pub enum Error { } pub type Result = result::Result; -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[repr(u64)] pub enum EpollDispatch { Exit = 0, diff --git a/vmm/src/serial_manager.rs b/vmm/src/serial_manager.rs index a208c5c42..d5ead8bff 100644 --- a/vmm/src/serial_manager.rs +++ b/vmm/src/serial_manager.rs @@ -56,7 +56,7 @@ pub enum Error { } pub type Result = result::Result; -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[repr(u64)] pub enum EpollDispatch { File = 0, diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index ee4cd4d32..40138fd33 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -309,7 +309,7 @@ pub enum Error { } pub type Result = result::Result; -#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq)] +#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq)] pub enum VmState { Created, Running,