kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypervisor: Refactor create_passthrough_device() for generic type

Browse Source 
Changed the return type of create_passthrough_device() to generic type
hypervisor::Device.

Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao
2020-07-21 17:56:00 +08:00
committed by Samuel Ortiz
parent 6c8749adf2
commit ddf1b76906
4 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hypervisor/src/device.rs
View File

@@ -10,6 +10,7 @@
//
use crate::DeviceAttr;
use std::os::unix::io::AsRawFd;
use thiserror::Error;
#[derive(Error, Debug)]
@@ -33,7 +34,7 @@ pub type Result<T> = std::result::Result<T, HypervisorDeviceError>;
///
/// This crate provides a hypervisor-agnostic interfaces for device
///
pub trait Device: Send + Sync {
pub trait Device: Send + Sync + AsRawFd {
/// Set device attribute.
fn set_device_attr(&self, attr: &DeviceAttr) -> Result<()>;
}

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

@@ -9,6 +9,7 @@
//
use kvm_ioctls::{NoDatamatch, VcpuFd, VmFd};
use std::os::unix::io::{AsRawFd, RawFd};
use std::result;
use std::sync::Arc;
#[cfg(target_arch = "x86_64")]
@@ -303,15 +304,14 @@ impl vm::Vm for KvmVm {
self.fd.check_extension(c)
}
/// Create a device that is used for passthrough
fn create_passthrough_device(&self) -> vm::Result<DeviceFd> {
fn create_passthrough_device(&self) -> vm::Result<Arc<dyn device::Device>> {
let mut vfio_dev = kvm_create_device {
type_: kvm_device_type_KVM_DEV_TYPE_VFIO,
fd: 0,
flags: 0,
};
self.fd
.create_device(&mut vfio_dev)
self.create_device(&mut vfio_dev)
.map_err(|e| vm::HypervisorVmError::CreatePassthroughDevice(e.into()))
}
}
@@ -869,3 +869,9 @@ impl device::Device for KvmDevice {
.map_err(|e| device::HypervisorDeviceError::SetDeviceAttribute(e.into()))
}
}
impl AsRawFd for KvmDevice {
fn as_raw_fd(&self) -> RawFd {
self.fd.as_raw_fd()
}
}

4
hypervisor/src/vm.rs
View File

@@ -14,7 +14,7 @@ use crate::cpu::Vcpu;
use crate::device::Device;
#[cfg(target_arch = "x86_64")]
use crate::ClockData;
use crate::{CreateDevice, DeviceFd, IoEventAddress, IrqRoutingEntry, MemoryRegion};
use crate::{CreateDevice, IoEventAddress, IrqRoutingEntry, MemoryRegion};
use kvm_ioctls::Cap;
use std::sync::Arc;
use thiserror::Error;
@@ -178,5 +178,5 @@ pub trait Vm: Send + Sync {
/// Checks if a particular `Cap` is available.
fn check_extension(&self, c: Cap) -> bool;
/// Create a device that is used for passthrough
fn create_passthrough_device(&self) -> Result<DeviceFd>;
fn create_passthrough_device(&self) -> Result<Arc<dyn Device>>;
}