diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/crosvm.rs | 2 | ||||
| -rw-r--r-- | src/linux.rs | 14 | ||||
| -rw-r--r-- | src/main.rs | 19 |
3 files changed, 34 insertions, 1 deletions
diff --git a/src/crosvm.rs b/src/crosvm.rs index bc39e7f..b7055df 100644 --- a/src/crosvm.rs +++ b/src/crosvm.rs @@ -109,6 +109,7 @@ pub struct Config { pub virtio_keyboard: Option<PathBuf>, pub virtio_input_evdevs: Vec<PathBuf>, pub split_irqchip: bool, + pub vfio: Option<PathBuf>, } impl Default for Config { @@ -153,6 +154,7 @@ impl Default for Config { virtio_keyboard: None, virtio_input_evdevs: Vec::new(), split_irqchip: false, + vfio: None, } } } diff --git a/src/linux.rs b/src/linux.rs index 58e0971..f2433f7 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -27,7 +27,10 @@ use libc::{self, c_int, gid_t, uid_t}; use audio_streams::DummyStreamSource; use devices::virtio::{self, VirtioDevice}; -use devices::{self, HostBackendDeviceProvider, PciDevice, VirtioPciDevice, XhciController}; +use devices::{ + self, HostBackendDeviceProvider, PciDevice, VfioDevice, VfioPciDevice, VirtioPciDevice, + XhciController, +}; use io_jail::{self, Minijail}; use kvm::*; use libcras::CrasClient; @@ -91,6 +94,7 @@ pub enum Error { CreateTimerFd(sys_util::Error), CreateTpmStorage(PathBuf, io::Error), CreateUsbProvider(devices::usb::host_backend::error::Error), + CreateVfioDevice(devices::vfio::VfioError), DeviceJail(io_jail::Error), DevicePivotRoot(io_jail::Error), Disk(io::Error), @@ -172,6 +176,7 @@ impl Display for Error { write!(f, "failed to create tpm storage dir {}: {}", p.display(), e) } CreateUsbProvider(e) => write!(f, "failed to create usb provider: {}", e), + CreateVfioDevice(e) => write!(f, "Failed to create vfio device {}", e), DeviceJail(e) => write!(f, "failed to jail device: {}", e), DevicePivotRoot(e) => write!(f, "failed to pivot root device: {}", e), Disk(e) => write!(f, "failed to load disk image: {}", e), @@ -979,6 +984,13 @@ fn create_devices( let usb_controller = Box::new(XhciController::new(mem.clone(), usb_provider)); pci_devices.push((usb_controller, simple_jail(&cfg, "xhci.policy")?)); + if cfg.vfio.is_some() { + let vfio_path = cfg.vfio.as_ref().unwrap().as_path(); + let vfiodevice = Box::new(VfioDevice::new(vfio_path, vm).map_err(Error::CreateVfioDevice)?); + let vfiopcidevice = Box::new(VfioPciDevice::new(vfiodevice)); + pci_devices.push((vfiopcidevice, simple_jail(&cfg, "vfio_device.policy")?)); + } + Ok(pci_devices) } diff --git a/src/main.rs b/src/main.rs index 75d08ae..a864833 100644 --- a/src/main.rs +++ b/src/main.rs @@ -685,6 +685,24 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument:: } cfg.executable_path = Some(Executable::Bios(PathBuf::from(value.unwrap().to_owned()))); } + "vfio" => { + let vfio_path = PathBuf::from(value.unwrap()); + if !vfio_path.exists() { + return Err(argument::Error::InvalidValue { + value: value.unwrap().to_owned(), + expected: "the vfio path does not exist", + }); + } + if !vfio_path.is_dir() { + return Err(argument::Error::InvalidValue { + value: value.unwrap().to_owned(), + expected: "the vfio path should be directory", + }); + } + + cfg.vfio = Some(vfio_path); + } + "help" => return Err(argument::Error::PrintHelp), _ => unreachable!(), } @@ -774,6 +792,7 @@ fn run_vm(args: std::env::Args) -> std::result::Result<(), ()> { #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] Argument::flag("split-irqchip", "(EXPERIMENTAL) enable split-irqchip support"), Argument::value("bios", "PATH", "Path to BIOS/firmware ROM"), + Argument::value("vfio", "PATH", "Path to sysfs of pass through or mdev device"), Argument::short_flag('h', "help", "Print help message.")]; let mut cfg = Config::default(); |