fix clippy warnings

- We need to derive Eq when deriving PartialEq
- We need to allow a late initialization so we can share code
on x86_64 and aarch64.

Signed-off-by: Andreea Florescu <fandree@amazon.com>

Author: andreeaflorescu

src/utils/src/resource_download.rs

@@ -4,7 +4,7 @@
 use std::path::PathBuf;
 use std::process::Command;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum Error {
     DownloadError(String),
 }

src/vm-vcpu-ref/src/aarch64/interrupts.rs

@@ -33,7 +33,7 @@ const AARCH64_GIC_CPUI_BASE: u64 = AARCH64_GIC_DIST_BASE - AARCH64_GIC_CPUI_SIZE
 const AARCH64_GIC_REDIST_SIZE: u64 = 0x20000;
 
 /// Specifies the version of the GIC device
-#[derive(Debug, PartialEq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum GicVersion {
     // The following casts are safe because the device type has small values (i.e. 5 and 7)
     /// GICv2 identifier.

src/vm-vcpu-ref/src/aarch64/regs/icc.rs

@@ -55,7 +55,7 @@ const ICC_CTLR_EL1_PRIBITS_SHIFT: u64 = 8;
 const ICC_CTLR_EL1_PRIBITS_MASK: u64 = 7 << ICC_CTLR_EL1_PRIBITS_SHIFT;
 
 /// Structure for serializing the state of the GIC ICC regs
-#[derive(Clone, Debug, PartialEq, Default)]
+#[derive(Clone, Debug, PartialEq, Eq, Default)]
 pub struct GicSysRegsState {
     main_icc_regs: Vec<GicRegState<u64>>,
     ap_icc_regs: Vec<Option<GicRegState<u64>>>,

src/vm-vcpu-ref/src/aarch64/regs/mod.rs

@@ -17,7 +17,7 @@ mod icc;
 mod redist;
 
 /// Generic GIC register state,
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct GicRegState<T> {
     pub(crate) chunks: Vec<T>,
 }
@@ -167,7 +167,7 @@ fn kvm_device_attr<RegChunk>(
 }
 
 /// Structure representing a simple register.
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 struct SimpleReg {
     /// The offset from the component address. The register is memory mapped here.
     offset: u64,

src/vm-vcpu-ref/src/x86_64/interrupts.rs

@@ -31,7 +31,7 @@ pub const APIC_LVT0_REG_OFFSET: usize = 0x350;
 pub const APIC_LVT1_REG_OFFSET: usize = 0x360;
 
 /// Specifies the type of interrupt to be sent to the processor.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 // We user upper case acronyms so that we can stick to the names as they're
 // defined in the Intel Manual.
 #[allow(clippy::upper_case_acronyms)]
@@ -49,7 +49,7 @@ pub enum DeliveryMode {
 }
 
 /// Errors associated with operations related to interrupts.
-#[derive(Debug, PartialEq, thiserror::Error)]
+#[derive(Debug, PartialEq, Eq, thiserror::Error)]
 pub enum Error {
     /// The register offset is invalid.
     #[error("The register offset is invalid.")]

src/vm-vcpu-ref/src/x86_64/mptable.rs

@@ -48,7 +48,7 @@ const MPTABLE_START: u64 = 0x9fc00;
 /// Last usable IRQ ID for virtio device interrupts on x86_64.
 pub const IRQ_MAX: u8 = 23;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 /// Errors associated with creating and operating with the MP Table.
 pub enum Error {
     /// There was too little guest memory to store the entire MP table.

src/vm-vcpu/src/vcpu/mod.rs

@@ -326,6 +326,9 @@ impl KvmVcpu {
     thread_local!(static TLS_VCPU_PTR: RefCell<Option<*const KvmVcpu>> = RefCell::new(None));
 
     /// Create a new vCPU.
+    // This is needed so we can initialize the vcpu the same way on x86_64 and aarch64, but
+    // have it as mutable on aarch64.
+    #[allow(clippy::needless_late_init)]
     pub fn new<M: GuestMemory>(
         vm_fd: &VmFd,
         device_mgr: Arc<Mutex<IoManager>>,

src/vm-vcpu/src/vm.rs

@@ -187,7 +187,7 @@ pub trait ExitHandler: Clone {
 }
 
 /// Represents the current state of the VM.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum VmRunState {
     Running,
     Suspending,
@@ -492,7 +492,7 @@ impl<EH: 'static + ExitHandler + Send> KvmVm<EH> {
                 .name(format!("vcpu_{}", id))
                 .spawn(move || {
                     // TODO: Check the result of both vcpu run & kick.
-                    let _ = vcpu.run(vcpu_run_addr).unwrap();
+                    vcpu.run(vcpu_run_addr).unwrap();
                     let _ = vcpu_exit_handler.kick();
                     vcpu.run_state.set_and_notify(VmRunState::Exiting);
                 })

src/vmm/src/boot.rs

@@ -28,7 +28,7 @@ const EBDA_START: u64 = 0x0009_fc00;
 // See https://github.com/rust-vmm/linux-loader/issues/51
 const E820_RAM: u32 = 1;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 /// Errors pertaining to boot parameter setup.
 pub enum Error {
     /// Invalid E820 configuration.

src/vmm/src/config/mod.rs

@@ -20,7 +20,7 @@ mod builder;
 const KERNEL_CMDLINE_CAPACITY: usize = 4096;
 
 /// Errors encountered converting the `*Config` objects.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum ConversionError {
     /// Failed to parse the string representation for the kernel.
     ParseKernel(String),
@@ -73,7 +73,7 @@ impl fmt::Display for ConversionError {
 }
 
 /// Guest memory configurations.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct MemoryConfig {
     /// Guest memory size in MiB.
     pub size_mib: u32,
@@ -104,7 +104,7 @@ impl TryFrom<&str> for MemoryConfig {
 }
 
 /// vCPU configurations.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct VcpuConfig {
     /// Number of vCPUs.
     pub num: u8,
@@ -207,7 +207,7 @@ impl TryFrom<&str> for KernelConfig {
     }
 }
 /// Network device configuration.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct NetConfig {
     /// Name of tap device.
     pub tap_name: String,
@@ -233,7 +233,7 @@ impl TryFrom<&str> for NetConfig {
 }
 
 /// Block device configuration
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct BlockConfig {
     /// Path to the block device backend.
     pub path: PathBuf,