hypervisor: rename get_cpuid to get_supported_cpuid

To better reflect its nature and avoid confusion with get_cpuid2.

No functional change.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2023-02-14 12:38:42 +00:00 committed by Liu Wei
parent 74dcb37ec3
commit de3ca97095
4 changed files with 6 additions and 4 deletions

View File

@ -609,7 +609,9 @@ pub fn generate_common_cpuid(
]; ];
// Supported CPUID // Supported CPUID
let mut cpuid = hypervisor.get_cpuid().map_err(Error::CpuidGetSupported)?; let mut cpuid = hypervisor
.get_supported_cpuid()
.map_err(Error::CpuidGetSupported)?;
CpuidPatch::patch_cpuid(&mut cpuid, cpuid_patches); CpuidPatch::patch_cpuid(&mut cpuid, cpuid_patches);

View File

@ -108,7 +108,7 @@ pub trait Hypervisor: Send + Sync {
/// ///
/// Get the supported CpuID /// Get the supported CpuID
/// ///
fn get_cpuid(&self) -> Result<Vec<CpuIdEntry>>; fn get_supported_cpuid(&self) -> Result<Vec<CpuIdEntry>>;
/// ///
/// Check particular extensions if any /// Check particular extensions if any
/// ///

View File

@ -1023,7 +1023,7 @@ impl hypervisor::Hypervisor for KvmHypervisor {
/// ///
/// X86 specific call to get the system supported CPUID values. /// X86 specific call to get the system supported CPUID values.
/// ///
fn get_cpuid(&self) -> hypervisor::Result<Vec<CpuIdEntry>> { fn get_supported_cpuid(&self) -> hypervisor::Result<Vec<CpuIdEntry>> {
let kvm_cpuid = self let kvm_cpuid = self
.kvm .kvm
.get_supported_cpuid(kvm_bindings::KVM_MAX_CPUID_ENTRIES) .get_supported_cpuid(kvm_bindings::KVM_MAX_CPUID_ENTRIES)

View File

@ -270,7 +270,7 @@ impl hypervisor::Hypervisor for MshvHypervisor {
/// ///
/// Get the supported CpuID /// Get the supported CpuID
/// ///
fn get_cpuid(&self) -> hypervisor::Result<Vec<CpuIdEntry>> { fn get_supported_cpuid(&self) -> hypervisor::Result<Vec<CpuIdEntry>> {
Ok(Vec::new()) Ok(Vec::new())
} }
} }