mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-03 20:15:45 +00:00
hypervisor: Cleanup unused Hypervisor trait members
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
01e2826f26
commit
2439625785
@ -12,8 +12,6 @@ use crate::vm::Vm;
|
|||||||
use crate::x86_64::CpuId;
|
use crate::x86_64::CpuId;
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
use crate::x86_64::MsrList;
|
use crate::x86_64::MsrList;
|
||||||
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
|
|
||||||
use kvm_ioctls::Cap;
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
@ -42,16 +40,6 @@ pub enum HypervisorError {
|
|||||||
#[error("Failed to get API Version: {0}")]
|
#[error("Failed to get API Version: {0}")]
|
||||||
GetApiVersion(#[source] anyhow::Error),
|
GetApiVersion(#[source] anyhow::Error),
|
||||||
///
|
///
|
||||||
/// Vcpu mmap error
|
|
||||||
///
|
|
||||||
#[error("Failed to get Vcpu Mmap: {0}")]
|
|
||||||
GetVcpuMmap(#[source] anyhow::Error),
|
|
||||||
///
|
|
||||||
/// Max Vcpu error
|
|
||||||
///
|
|
||||||
#[error("Failed to get number of max vcpus: {0}")]
|
|
||||||
GetMaxVcpu(#[source] anyhow::Error),
|
|
||||||
///
|
|
||||||
/// CpuId error
|
/// CpuId error
|
||||||
///
|
///
|
||||||
#[error("Failed to get cpuid: {0}")]
|
#[error("Failed to get cpuid: {0}")]
|
||||||
@ -90,26 +78,6 @@ pub trait Hypervisor: Send + Sync {
|
|||||||
/// Return a hypervisor-agnostic Vm trait object
|
/// Return a hypervisor-agnostic Vm trait object
|
||||||
///
|
///
|
||||||
fn create_vm_with_type(&self, vm_type: u64) -> Result<Arc<dyn Vm>>;
|
fn create_vm_with_type(&self, vm_type: u64) -> Result<Arc<dyn Vm>>;
|
||||||
#[cfg(feature = "kvm")]
|
|
||||||
///
|
|
||||||
/// Returns the size of the memory mapping required to use the vcpu's structures
|
|
||||||
///
|
|
||||||
fn get_vcpu_mmap_size(&self) -> Result<usize>;
|
|
||||||
#[cfg(feature = "kvm")]
|
|
||||||
///
|
|
||||||
/// Gets the recommended maximum number of VCPUs per VM.
|
|
||||||
///
|
|
||||||
fn get_max_vcpus(&self) -> Result<usize>;
|
|
||||||
#[cfg(feature = "kvm")]
|
|
||||||
///
|
|
||||||
/// Gets the recommended number of VCPUs per VM.
|
|
||||||
///
|
|
||||||
fn get_nr_vcpus(&self) -> Result<usize>;
|
|
||||||
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
|
|
||||||
///
|
|
||||||
/// Checks if a particular `Cap` is available.
|
|
||||||
///
|
|
||||||
fn check_capability(&self, c: Cap) -> bool;
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
///
|
///
|
||||||
/// Get the supported CpuID
|
/// Get the supported CpuID
|
||||||
|
@ -565,33 +565,6 @@ impl hypervisor::Hypervisor for KvmHypervisor {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
///
|
|
||||||
/// Returns the size of the memory mapping required to use the vcpu's `kvm_run` structure.
|
|
||||||
///
|
|
||||||
fn get_vcpu_mmap_size(&self) -> hypervisor::Result<usize> {
|
|
||||||
self.kvm
|
|
||||||
.get_vcpu_mmap_size()
|
|
||||||
.map_err(|e| hypervisor::HypervisorError::GetVcpuMmap(e.into()))
|
|
||||||
}
|
|
||||||
///
|
|
||||||
/// Gets the recommended maximum number of VCPUs per VM.
|
|
||||||
///
|
|
||||||
fn get_max_vcpus(&self) -> hypervisor::Result<usize> {
|
|
||||||
Ok(self.kvm.get_max_vcpus())
|
|
||||||
}
|
|
||||||
///
|
|
||||||
/// Gets the recommended number of VCPUs per VM.
|
|
||||||
///
|
|
||||||
fn get_nr_vcpus(&self) -> hypervisor::Result<usize> {
|
|
||||||
Ok(self.kvm.get_nr_vcpus())
|
|
||||||
}
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
///
|
|
||||||
/// Checks if a particular `Cap` is available.
|
|
||||||
///
|
|
||||||
fn check_capability(&self, c: Cap) -> bool {
|
|
||||||
self.kvm.check_extension(c)
|
|
||||||
}
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
///
|
///
|
||||||
/// X86 specific call to get the system supported CPUID values.
|
/// X86 specific call to get the system supported CPUID values.
|
||||||
|
@ -1502,7 +1502,7 @@ mod tests {
|
|||||||
fn test_setlint() {
|
fn test_setlint() {
|
||||||
let hv = hypervisor::new().unwrap();
|
let hv = hypervisor::new().unwrap();
|
||||||
let vm = hv.create_vm().expect("new VM fd creation failed");
|
let vm = hv.create_vm().expect("new VM fd creation failed");
|
||||||
assert!(hv.check_capability(hypervisor::kvm::Cap::Irqchip));
|
assert!(hv.check_required_extensions().is_ok());
|
||||||
// Calling get_lapic will fail if there is no irqchip before hand.
|
// Calling get_lapic will fail if there is no irqchip before hand.
|
||||||
assert!(vm.create_irq_chip().is_ok());
|
assert!(vm.create_irq_chip().is_ok());
|
||||||
let vcpu = vm.create_vcpu(0, None).unwrap();
|
let vcpu = vm.create_vcpu(0, None).unwrap();
|
||||||
|
Loading…
Reference in New Issue
Block a user