External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-15 13:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypervisor: Retrieve list of supported MSRs

Browse Source 
Add a new function to the hypervisor trait so that the caller can
retrieve the list of MSRs supported by this hypervisor.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-06-29 18:00:49 +02:00 committed by Rob Bradford
parent e2b5c78dc5
commit 49b4fba283
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hypervisor/src/hypervisor.rs
View File

@ -9,7 +9,7 @@
// //
use crate::vm::Vm; use crate::vm::Vm;
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
use crate::x86_64::CpuId; use crate::x86_64::{CpuId, MsrList};
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
use kvm_ioctls::Cap; use kvm_ioctls::Cap;
use std::sync::Arc; use std::sync::Arc;
@ -55,6 +55,11 @@ pub enum HypervisorError {
/// ///
#[error("Failed to get number of max vcpus: {0}")] #[error("Failed to get number of max vcpus: {0}")]
GetCpuId(#[source] anyhow::Error), GetCpuId(#[source] anyhow::Error),
///
/// Failed to retrieve list of MSRs.
///
#[error("Failed to get the list of supported MSRs: {0}")]
GetMsrList(#[source] anyhow::Error),
} }
/// ///
@ -103,4 +108,9 @@ pub trait Hypervisor: Send + Sync {
/// Check particular extensions if any /// Check particular extensions if any
/// ///
fn check_required_extensions(&self) -> Result<()>; fn check_required_extensions(&self) -> Result<()>;
#[cfg(target_arch = "x86_64")]
///
/// Retrieve the list of MSRs supported by the hypervisor.
///
fn get_msr_list(&self) -> Result<MsrList>;
} }

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

@ -36,7 +36,7 @@ pub use x86_64::{
}; };
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
use kvm_bindings::{kvm_enable_cap, KVM_CAP_SPLIT_IRQCHIP}; use kvm_bindings::{kvm_enable_cap, MsrList, KVM_CAP_SPLIT_IRQCHIP};
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
use crate::arch::x86::NUM_IOAPIC_PINS; use crate::arch::x86::NUM_IOAPIC_PINS;
@ -333,6 +333,15 @@ impl hypervisor::Hypervisor for KvmHypervisor {
.get_supported_cpuid(kvm_bindings::KVM_MAX_CPUID_ENTRIES) .get_supported_cpuid(kvm_bindings::KVM_MAX_CPUID_ENTRIES)
.map_err(|e| hypervisor::HypervisorError::GetCpuId(e.into())) .map_err(|e| hypervisor::HypervisorError::GetCpuId(e.into()))
} }
#[cfg(target_arch = "x86_64")]
///
/// Retrieve the list of MSRs supported by KVM.
///
fn get_msr_list(&self) -> hypervisor::Result<MsrList> {
self.kvm
.get_msr_index_list()
.map_err(|e| hypervisor::HypervisorError::GetMsrList(e.into()))
}
} }
/// Vcpu struct for KVM /// Vcpu struct for KVM
pub struct KvmVcpu { pub struct KvmVcpu {

2
hypervisor/src/kvm/x86_64/mod.rs
View File

@ -24,7 +24,7 @@ pub use {
kvm_bindings::kvm_segment as SegmentRegister, kvm_bindings::kvm_sregs as SpecialRegisters, kvm_bindings::kvm_segment as SegmentRegister, kvm_bindings::kvm_sregs as SpecialRegisters,
kvm_bindings::kvm_vcpu_events as VcpuEvents, kvm_bindings::kvm_vcpu_events as VcpuEvents,
kvm_bindings::kvm_xcrs as ExtendedControlRegisters, kvm_bindings::kvm_xsave as Xsave, kvm_bindings::kvm_xcrs as ExtendedControlRegisters, kvm_bindings::kvm_xsave as Xsave,
kvm_bindings::CpuId, kvm_bindings::Msrs as MsrEntries, kvm_bindings::CpuId, kvm_bindings::MsrList, kvm_bindings::Msrs as MsrEntries,
}; };
pub const KVM_TSS_ADDRESS: GuestAddress = GuestAddress(0xfffb_d000); pub const KVM_TSS_ADDRESS: GuestAddress = GuestAddress(0xfffb_d000);