External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 02:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

tdx: Address Rust 1.51.0 clippy issue (upper_case_acroynms)

Browse Source 
error: name `FinalizeTDX` contains a capitalized acronym
   --> vmm/src/vm.rs:274:5
    |
274 |     FinalizeTDX(hypervisor::HypervisorVmError),
    |     ^^^^^^^^^^^ help: consider making the acronym lowercase, except the initial letter: `FinalizeTdx`
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#upper_case_acronyms

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-03-25 17:01:21 +00:00
parent e294688904
commit 3c6dfd7709
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hypervisor/src/kvm/mod.rs
View File

@ -369,7 +369,7 @@ impl vm::Vm for KvmVm {
reserved: u32, reserved: u32,
attributes: u64, attributes: u64,
cpuid: u64, cpuid: u64,
}; }
let data = TdxInitVm { let data = TdxInitVm {
max_vcpus, max_vcpus,
reserved: 0, reserved: 0,
@ -411,7 +411,7 @@ impl vm::Vm for KvmVm {
host_address: u64, host_address: u64,
guest_address: u64, guest_address: u64,
pages: u64, pages: u64,
}; }
let data = TdxInitMemRegion { let data = TdxInitMemRegion {
host_address, host_address,
guest_address, guest_address,
@ -440,7 +440,7 @@ fn tdx_command(
command: TdxCommand, command: TdxCommand,
metadata: u32, metadata: u32,
data: u64, data: u64,
}; }
let cmd = TdxIoctlCmd { let cmd = TdxIoctlCmd {
command, command,
metadata, metadata,

6
vmm/src/config.rs
View File

@ -123,7 +123,7 @@ pub enum ValidationError {
InvalidHugePageSize(u64), InvalidHugePageSize(u64),
// CPU Hotplug not permitted with TDX // CPU Hotplug not permitted with TDX
#[cfg(feature = "tdx")] #[cfg(feature = "tdx")]
TdxNoCPUHotplug, TdxNoCpuHotplug,
} }
type ValidationResult<T> = std::result::Result<T, ValidationError>; type ValidationResult<T> = std::result::Result<T, ValidationError>;
@ -160,7 +160,7 @@ impl fmt::Display for ValidationError {
write!(f, "Huge page size is not power of 2: {}", s) write!(f, "Huge page size is not power of 2: {}", s)
} }
#[cfg(feature = "tdx")] #[cfg(feature = "tdx")]
TdxNoCPUHotplug => { TdxNoCpuHotplug => {
write!(f, "CPU hotplug not possible with TDX") write!(f, "CPU hotplug not possible with TDX")
} }
} }
@ -1612,7 +1612,7 @@ impl VmConfig {
return Err(ValidationError::KernelMissing); return Err(ValidationError::KernelMissing);
} }
if tdx_enabled && (self.cpus.max_vcpus != self.cpus.boot_vcpus) { if tdx_enabled && (self.cpus.max_vcpus != self.cpus.boot_vcpus) {
return Err(ValidationError::TdxNoCPUHotplug); return Err(ValidationError::TdxNoCpuHotplug);
} }
} }

12
vmm/src/vm.rs
View File

@ -263,15 +263,15 @@ pub enum Error {
/// Error enabling TDX VM /// Error enabling TDX VM
#[cfg(feature = "tdx")] #[cfg(feature = "tdx")]
InitializeTDXVM(hypervisor::HypervisorVmError), InitializeTdxVm(hypervisor::HypervisorVmError),
/// Error enabling TDX memory region /// Error enabling TDX memory region
#[cfg(feature = "tdx")] #[cfg(feature = "tdx")]
InitializeTDXMemoryRegion(hypervisor::HypervisorVmError), InitializeTdxMemoryRegion(hypervisor::HypervisorVmError),
/// Error finalizing TDX setup /// Error finalizing TDX setup
#[cfg(feature = "tdx")] #[cfg(feature = "tdx")]
FinalizeTDX(hypervisor::HypervisorVmError), FinalizeTdx(hypervisor::HypervisorVmError),
} }
pub type Result<T> = result::Result<T, Error>; pub type Result<T> = result::Result<T, Error>;
@ -1552,7 +1552,7 @@ impl Vm {
let max_vcpus = self.cpu_manager.lock().unwrap().max_vcpus() as u32; let max_vcpus = self.cpu_manager.lock().unwrap().max_vcpus() as u32;
self.vm self.vm
.tdx_init(&cpuid, max_vcpus) .tdx_init(&cpuid, max_vcpus)
.map_err(Error::InitializeTDXVM)?; .map_err(Error::InitializeTdxVm)?;
Ok(()) Ok(())
} }
@ -1669,7 +1669,7 @@ impl Vm {
/* TDVF_SECTION_ATTRIBUTES_EXTENDMR */ /* TDVF_SECTION_ATTRIBUTES_EXTENDMR */
section.attributes == 1, section.attributes == 1,
) )
.map_err(Error::InitializeTDXMemoryRegion)?; .map_err(Error::InitializeTdxMemoryRegion)?;
} }
Ok(hob_offset) Ok(hob_offset)
@ -1729,7 +1729,7 @@ impl Vm {
.initialize_tdx(hob_address) .initialize_tdx(hob_address)
.map_err(Error::CpuManager)?; .map_err(Error::CpuManager)?;
// With TDX memory and CPU state configured TDX setup is complete // With TDX memory and CPU state configured TDX setup is complete
self.vm.tdx_finalize().map_err(Error::FinalizeTDX)?; self.vm.tdx_finalize().map_err(Error::FinalizeTdx)?;
} }
self.cpu_manager self.cpu_manager