mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-02 11:35:46 +00:00
hypervisor: drop check_extension from Vm trait
Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
parent
e931c40e96
commit
cb6a14dec9
@ -325,6 +325,10 @@ impl KvmVm {
|
|||||||
.map_err(|e| vm::HypervisorVmError::CreateDevice(e.into()))?;
|
.map_err(|e| vm::HypervisorVmError::CreateDevice(e.into()))?;
|
||||||
Ok(VfioDeviceFd::new_from_kvm(device_fd))
|
Ok(VfioDeviceFd::new_from_kvm(device_fd))
|
||||||
}
|
}
|
||||||
|
/// Checks if a particular `Cap` is available.
|
||||||
|
fn check_extension(&self, c: Cap) -> bool {
|
||||||
|
self.fd.check_extension(c)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
///
|
///
|
||||||
@ -681,10 +685,6 @@ impl vm::Vm for KvmVm {
|
|||||||
.set_clock(&data)
|
.set_clock(&data)
|
||||||
.map_err(|e| vm::HypervisorVmError::SetClock(e.into()))
|
.map_err(|e| vm::HypervisorVmError::SetClock(e.into()))
|
||||||
}
|
}
|
||||||
/// Checks if a particular `Cap` is available.
|
|
||||||
fn check_extension(&self, c: Cap) -> bool {
|
|
||||||
self.fd.check_extension(c)
|
|
||||||
}
|
|
||||||
/// Create a device that is used for passthrough
|
/// Create a device that is used for passthrough
|
||||||
fn create_passthrough_device(&self) -> vm::Result<VfioDeviceFd> {
|
fn create_passthrough_device(&self) -> vm::Result<VfioDeviceFd> {
|
||||||
let mut vfio_dev = kvm_create_device {
|
let mut vfio_dev = kvm_create_device {
|
||||||
|
@ -19,8 +19,6 @@ use crate::cpu::Vcpu;
|
|||||||
use crate::ClockData;
|
use crate::ClockData;
|
||||||
use crate::UserMemoryRegion;
|
use crate::UserMemoryRegion;
|
||||||
use crate::{IoEventAddress, IrqRoutingEntry};
|
use crate::{IoEventAddress, IrqRoutingEntry};
|
||||||
#[cfg(feature = "kvm")]
|
|
||||||
use kvm_ioctls::Cap;
|
|
||||||
use std::any::Any;
|
use std::any::Any;
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
@ -326,9 +324,6 @@ pub trait Vm: Send + Sync + Any {
|
|||||||
/// Set guest clock.
|
/// Set guest clock.
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
fn set_clock(&self, data: &ClockData) -> Result<()>;
|
fn set_clock(&self, data: &ClockData) -> Result<()>;
|
||||||
#[cfg(feature = "kvm")]
|
|
||||||
/// Checks if a particular `Cap` is available.
|
|
||||||
fn check_extension(&self, c: Cap) -> bool;
|
|
||||||
/// Create a device that is used for passthrough
|
/// Create a device that is used for passthrough
|
||||||
fn create_passthrough_device(&self) -> Result<vfio_ioctls::VfioDeviceFd>;
|
fn create_passthrough_device(&self) -> Result<vfio_ioctls::VfioDeviceFd>;
|
||||||
/// Start logging dirty pages
|
/// Start logging dirty pages
|
||||||
|
Loading…
Reference in New Issue
Block a user