diff --git a/arch/src/aarch64/mod.rs b/arch/src/aarch64/mod.rs index 136620c85..2aedc6996 100644 --- a/arch/src/aarch64/mod.rs +++ b/arch/src/aarch64/mod.rs @@ -37,7 +37,7 @@ pub enum Error { InitramfsAddress, /// Error configuring the general purpose registers - REGSConfiguration(regs::Error), + RegsConfiguration(regs::Error), /// Error configuring the MPIDR register VcpuRegMPIDR(hypervisor::HypervisorCpuError), @@ -71,7 +71,7 @@ pub fn configure_vcpu( kernel_entry_point.entry_addr.raw_value(), &vm_memory.memory(), ) - .map_err(Error::REGSConfiguration)?; + .map_err(Error::RegsConfiguration)?; } let mpidr = fd.read_mpidr().map_err(Error::VcpuRegMPIDR)?; diff --git a/arch/src/lib.rs b/arch/src/lib.rs index e6cccc7ca..8a7064205 100644 --- a/arch/src/lib.rs +++ b/arch/src/lib.rs @@ -56,7 +56,7 @@ pub enum Error { /// Error writing module entry to guest memory. ModlistSetup(vm_memory::GuestMemoryError), /// RSDP Beyond Guest Memory - RSDPPastRamEnd, + RsdpPastRamEnd, } /// Type for returning public functions outcome. diff --git a/arch/src/x86_64/mod.rs b/arch/src/x86_64/mod.rs index 682328314..3b33cd11c 100644 --- a/arch/src/x86_64/mod.rs +++ b/arch/src/x86_64/mod.rs @@ -147,16 +147,16 @@ pub enum Error { MpTableSetup(mptable::Error), /// Error configuring the general purpose registers - REGSConfiguration(regs::Error), + RegsConfiguration(regs::Error), /// Error configuring the special registers - SREGSConfiguration(regs::Error), + SregsConfiguration(regs::Error), /// Error configuring the floating point related registers - FPUConfiguration(regs::Error), + FpuConfiguration(regs::Error), /// Error configuring the MSR registers - MSRSConfiguration(regs::Error), + MsrsConfiguration(regs::Error), /// Failed to set supported CPUs. SetSupportedCpusFailed(anyhow::Error), @@ -183,7 +183,7 @@ impl From for super::Error { } } -#[allow(dead_code)] +#[allow(dead_code, clippy::upper_case_acronyms)] #[derive(Copy, Clone)] pub enum CpuidReg { EAX, @@ -348,7 +348,7 @@ pub fn configure_vcpu( fd.enable_hyperv_synic().unwrap(); } - regs::setup_msrs(fd).map_err(Error::MSRSConfiguration)?; + regs::setup_msrs(fd).map_err(Error::MsrsConfiguration)?; if let Some(kernel_entry_point) = kernel_entry_point { // Safe to unwrap because this method is called after the VM is configured regs::setup_regs( @@ -358,10 +358,10 @@ pub fn configure_vcpu( layout::ZERO_PAGE_START.raw_value(), kernel_entry_point.protocol, ) - .map_err(Error::REGSConfiguration)?; - regs::setup_fpu(fd).map_err(Error::FPUConfiguration)?; + .map_err(Error::RegsConfiguration)?; + regs::setup_fpu(fd).map_err(Error::FpuConfiguration)?; regs::setup_sregs(&vm_memory.memory(), fd, kernel_entry_point.protocol) - .map_err(Error::SREGSConfiguration)?; + .map_err(Error::SregsConfiguration)?; } interrupts::set_lint(fd).map_err(|e| Error::LocalIntConfiguration(e.into()))?; Ok(()) @@ -444,7 +444,7 @@ pub fn configure_system( // Check that the RAM is not smaller than the RSDP start address if let Some(rsdp_addr) = rsdp_addr { if rsdp_addr.0 > guest_mem.last_addr().0 { - return Err(super::Error::RSDPPastRamEnd); + return Err(super::Error::RsdpPastRamEnd); } } diff --git a/arch/src/x86_64/regs.rs b/arch/src/x86_64/regs.rs index 3fe8ca554..1887484f9 100644 --- a/arch/src/x86_64/regs.rs +++ b/arch/src/x86_64/regs.rs @@ -25,25 +25,25 @@ pub enum Error { /// Failed to set base registers for this CPU. SetBaseRegisters(hypervisor::HypervisorCpuError), /// Failed to configure the FPU. - SetFPURegisters(hypervisor::HypervisorCpuError), + SetFpuRegisters(hypervisor::HypervisorCpuError), /// Setting up MSRs failed. SetModelSpecificRegisters(hypervisor::HypervisorCpuError), /// Failed to set SREGs for this CPU. SetStatusRegisters(hypervisor::HypervisorCpuError), /// Checking the GDT address failed. - CheckGDTAddr, + CheckGdtAddr, /// Writing the GDT to RAM failed. - WriteGDT(GuestMemoryError), + WriteGdt(GuestMemoryError), /// Writing the IDT to RAM failed. - WriteIDT(GuestMemoryError), + WriteIdt(GuestMemoryError), /// Writing PDPTE to RAM failed. - WritePDPTEAddress(GuestMemoryError), + WritePdpteAddress(GuestMemoryError), /// Writing PDE to RAM failed. - WritePDEAddress(GuestMemoryError), + WritePdeAddress(GuestMemoryError), /// Writing PML4 to RAM failed. - WritePML4Address(GuestMemoryError), + WritePml4Address(GuestMemoryError), /// Writing PML5 to RAM failed. - WritePML5Address(GuestMemoryError), + WritePml5Address(GuestMemoryError), } pub type Result = result::Result; @@ -60,7 +60,7 @@ pub fn setup_fpu(vcpu: &Arc) -> Result<()> { ..Default::default() }; - vcpu.set_fpu(&fpu).map_err(Error::SetFPURegisters) + vcpu.set_fpu(&fpu).map_err(Error::SetFpuRegisters) } /// Configure Model Specific Registers (MSRs) for a given CPU. @@ -140,8 +140,8 @@ fn write_gdt_table(table: &[u64], guest_mem: &GuestMemoryMmap) -> Result<()> { for (index, entry) in table.iter().enumerate() { let addr = guest_mem .checked_offset(boot_gdt_addr, index * mem::size_of::()) - .ok_or(Error::CheckGDTAddr)?; - guest_mem.write_obj(*entry, addr).map_err(Error::WriteGDT)?; + .ok_or(Error::CheckGdtAddr)?; + guest_mem.write_obj(*entry, addr).map_err(Error::WriteGdt)?; } Ok(()) } @@ -150,7 +150,7 @@ fn write_idt_value(val: u64, guest_mem: &GuestMemoryMmap) -> Result<()> { let boot_idt_addr = BOOT_IDT_START; guest_mem .write_obj(val, boot_idt_addr) - .map_err(Error::WriteIDT) + .map_err(Error::WriteIdt) } pub fn configure_segments_and_sregs( @@ -220,7 +220,7 @@ pub fn setup_page_tables(mem: &GuestMemoryMmap, sregs: &mut SpecialRegisters) -> if unsafe { std::arch::x86_64::__cpuid(7).ecx } & (1 << 16) != 0 { // Entry covering VA [0..256TB) mem.write_obj(PML4_START.raw_value() | 0x03, PML5_START) - .map_err(Error::WritePML5Address)?; + .map_err(Error::WritePml5Address)?; sregs.cr3 = PML5_START.raw_value(); sregs.cr4 |= CR4_LA57; @@ -230,17 +230,17 @@ pub fn setup_page_tables(mem: &GuestMemoryMmap, sregs: &mut SpecialRegisters) -> // Entry covering VA [0..512GB) mem.write_obj(PDPTE_START.raw_value() | 0x03, PML4_START) - .map_err(Error::WritePML4Address)?; + .map_err(Error::WritePml4Address)?; // Entry covering VA [0..1GB) mem.write_obj(PDE_START.raw_value() | 0x03, PDPTE_START) - .map_err(Error::WritePDPTEAddress)?; + .map_err(Error::WritePdpteAddress)?; // 512 2MB entries together covering VA [0..1GB). Note we are assuming // CPU supports 2MB pages (/proc/cpuinfo has 'pse'). All modern CPUs do. for i in 0..512 { mem.write_obj((i << 21) + 0x83u64, PDE_START.unchecked_add(i * 8)) - .map_err(Error::WritePDEAddress)?; + .map_err(Error::WritePdeAddress)?; } sregs.cr4 |= CR4_PAE;