pci, vmm: Move to upstream vfio-ioctls crate

This commit moves both pci and vmm code from the internal vfio-ioctls
crate to the upstream one from the rust-vmm project.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>

vmm/Cargo.toml

@@ -40,7 +40,7 @@ serde_json = ">=1.0.9"
 signal-hook = "0.3.6"
 thiserror = "1.0"
 url = "2.2.1"
-vfio-ioctls = { git = "https://github.com/cloud-hypervisor/vfio-ioctls", branch = "ch" }
+vfio-ioctls = { git = "https://github.com/rust-vmm/vfio-ioctls", branch = "master" }
 virtio-devices = { path = "../virtio-devices" }
 vm-allocator = { path = "../vm-allocator" }
 vm-device = { path = "../vm-device" }

vmm/src/device_manager.rs

@@ -2691,12 +2691,8 @@ impl DeviceManager {
                 .map_err(DeviceManagerError::VfioCreate)?,
         );
 
-        let vfio_device = VfioDevice::new(
-            &device_cfg.path,
-            Arc::clone(&vfio_container),
-            device_cfg.iommu,
-        )
-        .map_err(DeviceManagerError::VfioCreate)?;
+        let vfio_device = VfioDevice::new(&device_cfg.path, Arc::clone(&vfio_container))
+            .map_err(DeviceManagerError::VfioCreate)?;
 
         if device_cfg.iommu {
             if let Some(iommu) = &self.iommu_device {
@@ -2731,9 +2727,11 @@ impl DeviceManager {
         let mut vfio_pci_device = VfioPciDevice::new(
             &self.address_manager.vm,
             vfio_device,
+            vfio_container,
             &self.msi_interrupt_manager,
             legacy_interrupt_group,
             memory,
+            device_cfg.iommu,
         )
         .map_err(DeviceManagerError::VfioPciCreate)?;