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

msix: Add VmFd to MsixConfig

Browse Source 
Because MsixConfig will be responsible for updating the KVM GSI routes
at some point, it must have access to the VmFd to invoke the KVM ioctl
KVM_SET_GSI_ROUTING.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2020-01-09 18:51:10 +01:00
committed by Samuel Ortiz
parent 86c760a0d9
commit 9b60fcdc39
6 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vm-virtio/src/transport/pci_device.rs
View File

@@ -15,6 +15,7 @@ extern crate vmm_sys_util;
use arc_swap::ArcSwap;
use devices::BusDevice;
use kvm_ioctls::VmFd;
use libc::EFD_NONBLOCK;
use pci::{
BarReprogrammingParams, InterruptDelivery, InterruptParameters, MsixCap, MsixConfig,
@@ -257,6 +258,7 @@ impl VirtioPciDevice {
msix_num: u16,
iommu_mapping_cb: Option<Arc<VirtioIommuRemapping>>,
allocator: &mut SystemAllocator,
vm_fd: &Arc<VmFd>,
) -> Result<Self> {
let device_clone = device.clone();
let locked_device = device_clone.lock().unwrap();
@@ -277,7 +279,11 @@ impl VirtioPciDevice {
let pci_device_id = VIRTIO_PCI_DEVICE_ID_BASE + locked_device.device_type() as u16;
let (msix_config, msix_config_clone) = if msix_num > 0 {
let msix_config = Arc::new(Mutex::new(MsixConfig::new(msix_num, allocator)));
let msix_config = Arc::new(Mutex::new(MsixConfig::new(
msix_num,
allocator,
vm_fd.clone(),
)));
let msix_config_clone = msix_config.clone();
(Some(msix_config), Some(msix_config_clone))
} else {