refactor(vmm): use upper camel case for error type

Update error items to use upper camel case for consistency.

Signed-off-by: Takahiro Itazuri <[email protected]>

Author: zulinx86

src/vmm/src/arch/x86_64/msr.rs

@@ -275,7 +275,7 @@ pub fn create_boot_msr_entries() -> Vec<kvm_msr_entry> {
 
 /// Error type for [`set_msrs`].
 #[derive(Debug, thiserror::Error, Eq, PartialEq)]
-pub enum SetMSRsError {
+pub enum SetMsrsError {
     /// Failed to create [`vmm_sys_util::fam::FamStructWrapper`] for MSRs.
     #[error("Could not create `vmm_sys_util::fam::FamStructWrapper` for MSRs")]
     Create(utils::fam::Error),
@@ -302,15 +302,15 @@ pub enum SetMSRsError {
 pub fn set_msrs(
     vcpu: &VcpuFd,
     msr_entries: &[kvm_msr_entry],
-) -> std::result::Result<(), SetMSRsError> {
-    let msrs = Msrs::from_entries(msr_entries).map_err(SetMSRsError::Create)?;
+) -> std::result::Result<(), SetMsrsError> {
+    let msrs = Msrs::from_entries(msr_entries).map_err(SetMsrsError::Create)?;
     vcpu.set_msrs(&msrs)
-        .map_err(SetMSRsError::Set)
+        .map_err(SetMsrsError::Set)
         .and_then(|msrs_written| {
             if msrs_written as u32 == msrs.as_fam_struct_ref().nmsrs {
                 Ok(())
             } else {
-                Err(SetMSRsError::Incomplete)
+                Err(SetMsrsError::Incomplete)
             }
         })
 }

src/vmm/src/vstate/vcpu/x86_64.rs

@@ -18,7 +18,7 @@ use versionize::{VersionMap, Versionize, VersionizeError, VersionizeResult};
 use versionize_derive::Versionize;
 
 use crate::arch::x86_64::interrupts;
-use crate::arch::x86_64::msr::{SetMSRsError, MSR_IA32_ARCH_CAPABILITIES};
+use crate::arch::x86_64::msr::{SetMsrsError, MSR_IA32_ARCH_CAPABILITIES};
 use crate::arch::x86_64::regs::{SetupFpuError, SetupRegistersError, SetupSpecialRegistersError};
 use crate::vstate::vcpu::{VcpuConfig, VcpuEmulation};
 use crate::vstate::vm::Vm;
@@ -47,19 +47,19 @@ pub enum Error {
     Fam(utils::fam::Error),
     /// Error configuring the floating point related registers
     #[error("Error configuring the floating point related registers: {0:?}")]
-    FPUConfiguration(crate::arch::x86_64::regs::Error),
+    FpuConfiguration(crate::arch::x86_64::regs::Error),
     /// Cannot set the local interruption due to bad configuration.
     #[error("Cannot set the local interruption due to bad configuration: {0:?}")]
     LocalIntConfiguration(crate::arch::x86_64::interrupts::Error),
     /// Error configuring the MSR registers
     #[error("Error configuring the MSR registers: {0:?}")]
-    MSRSConfiguration(crate::arch::x86_64::msr::Error),
+    MsrsConfiguration(crate::arch::x86_64::msr::Error),
     /// Error configuring the general purpose registers
     #[error("Error configuring the general purpose registers: {0:?}")]
-    REGSConfiguration(crate::arch::x86_64::regs::Error),
+    RegsConfiguration(crate::arch::x86_64::regs::Error),
     /// Error configuring the special registers
     #[error("Error configuring the special registers: {0:?}")]
-    SREGSConfiguration(crate::arch::x86_64::regs::Error),
+    SregsConfiguration(crate::arch::x86_64::regs::Error),
     /// Cannot open the VCPU file descriptor.
     #[error("Cannot open the VCPU file descriptor: {0}")]
     VcpuFd(kvm_ioctls::Error),
@@ -74,7 +74,7 @@ pub enum Error {
     VcpuGetMpState(kvm_ioctls::Error),
     /// The number of MSRS returned by the kernel is unexpected.
     #[error("Unexpected number of MSRS reported by the kernel")]
-    VcpuGetMSRSIncomplete,
+    VcpuGetMsrsIncomplete,
     /// Failed to get KVM vcpu msrs.
     #[error("Failed to get KVM vcpu msrs: {0}")]
     VcpuGetMsrs(kvm_ioctls::Error),
@@ -98,7 +98,7 @@ pub enum Error {
     VcpuGetCpuid(kvm_ioctls::Error),
     /// Failed to get KVM TSC freq.
     #[error("Failed to get KVM TSC frequency: {0}")]
-    VcpuGetTSC(kvm_ioctls::Error),
+    VcpuGetTsc(kvm_ioctls::Error),
     /// Failed to set KVM vcpu cpuid.
     #[error("Failed to set KVM vcpu cpuid: {0}")]
     VcpuSetCpuid(kvm_ioctls::Error),
@@ -116,7 +116,7 @@ pub enum Error {
     VcpuSetMsrs(kvm_ioctls::Error),
     /// Failed to set all KVM vcpu MSRs. Only a partial set was done.
     #[error("Failed to set all KVM MSRs for this vCPU. Only a partial write was done.")]
-    VcpuSetMSRSIncomplete,
+    VcpuSetMsrsIncomplete,
     /// Failed to set KVM vcpu regs.
     #[error("Failed to set KVM vcpu regs: {0}")]
     VcpuSetRegs(kvm_ioctls::Error),
@@ -134,7 +134,7 @@ pub enum Error {
     VcpuSetXsave(kvm_ioctls::Error),
     /// Failed to set KVM TSC freq.
     #[error("Failed to set KVM TSC frequency: {0}")]
-    VcpuSetTSC(kvm_ioctls::Error),
+    VcpuSetTsc(kvm_ioctls::Error),
     /// Failed to apply CPU template.
     #[error("Failed to apply CPU template")]
     VcpuTemplateError,
@@ -172,7 +172,7 @@ pub enum KvmVcpuConfigureError {
     #[error("Failed to get MSRs to save from CPUID: {0}")]
     MsrsToSaveByCpuid(crate::guest_config::cpuid::common::Leaf0NotFoundInCpuid),
     #[error("Failed to set MSRs: {0}")]
-    SetMsrs(#[from] SetMSRsError),
+    SetMsrs(#[from] SetMsrsError),
     #[error("Failed to setup registers: {0}")]
     SetupRegisters(#[from] SetupRegistersError),
     #[error("Failed to setup FPU: {0}")]
@@ -353,7 +353,7 @@ impl KvmVcpu {
             let expected_nmsrs = msrs.as_slice().len();
             let nmsrs = self.fd.get_msrs(msrs).map_err(Error::VcpuGetMsrs)?;
             if nmsrs != expected_nmsrs {
-                return Err(Error::VcpuGetMSRSIncomplete);
+                return Err(Error::VcpuGetMsrsIncomplete);
             }
         }
         let vcpu_events = self
@@ -450,7 +450,7 @@ impl KvmVcpu {
         for msrs in &state.saved_msrs {
             let nmsrs = self.fd.set_msrs(msrs).map_err(Error::VcpuSetMsrs)?;
             if nmsrs < msrs.as_fam_struct_ref().nmsrs as usize {
-                return Err(Error::VcpuSetMSRSIncomplete);
+                return Err(Error::VcpuSetMsrsIncomplete);
             }
         }
         self.fd

src/vmm/src/vstate/vm.rs

@@ -30,7 +30,7 @@ use crate::arch::aarch64::gic::GicState;
 pub enum Error {
     #[cfg(target_arch = "x86_64")]
     /// Retrieving supported guest MSRs fails.
-    GuestMSRs(crate::arch::x86_64::msr::Error),
+    GuestMsrs(crate::arch::x86_64::msr::Error),
     /// The number of configured slots is bigger than the maximum reported by KVM.
     NotEnoughMemorySlots,
     /// Cannot set the memory regions.
@@ -101,7 +101,7 @@ impl fmt::Display for Error {
 
         match self {
             #[cfg(target_arch = "x86_64")]
-            GuestMSRs(err) => write!(f, "Retrieving supported guest MSRs fails: {:?}", err),
+            GuestMsrs(err) => write!(f, "Retrieving supported guest MSRs fails: {:?}", err),
             #[cfg(target_arch = "aarch64")]
             VmCreateGIC(err) => write!(
                 f,
@@ -276,7 +276,7 @@ impl Vm {
             .get_supported_cpuid(KVM_MAX_CPUID_ENTRIES)
             .map_err(Error::VmFd)?;
         let supported_msrs =
-            crate::arch::x86_64::msr::supported_guest_msrs(kvm).map_err(Error::GuestMSRs)?;
+            crate::arch::x86_64::msr::supported_guest_msrs(kvm).map_err(Error::GuestMsrs)?;
 
         Ok(Vm {
             fd: vm_fd,