vfio: Rename to vfio-ioctls

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

vmm/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [features]
 default = []
 acpi = ["acpi_tables","devices/acpi", "arch/acpi"]
-pci_support = ["pci", "vfio", "vm-virtio/pci_support"]
+pci_support = ["pci", "vfio-ioctls", "vm-virtio/pci_support"]
 mmio_support = ["vm-virtio/mmio_support"]
 cmos = ["devices/cmos"]
 fwdebug = ["devices/fwdebug"]
@@ -34,7 +34,7 @@ serde = {version = ">=1.0.27", features = ["rc"] }
 serde_derive = ">=1.0.27"
 serde_json = ">=1.0.9"
 url = "2.1.1"
-vfio = { path = "../vfio", optional = true }
+vfio-ioctls = { path = "../vfio-ioctls", optional = true }
 vm-allocator = { path = "../vm-allocator" }
 vm-device = { path = "../vm-device" }
 vm-memory = { version = "0.2.1", features = ["backend-mmap", "backend-atomic"] }

vmm/src/device_manager.rs

@@ -55,7 +55,7 @@ use std::result;
 use std::sync::{Arc, Mutex};
 use tempfile::NamedTempFile;
 #[cfg(feature = "pci_support")]
-use vfio::{VfioDevice, VfioDmaMapping};
+use vfio_ioctls::{VfioDevice, VfioDmaMapping};
 use vm_allocator::SystemAllocator;
 use vm_device::interrupt::{
     InterruptIndex, InterruptManager, LegacyIrqGroupConfig, MsiIrqGroupConfig,
@@ -212,7 +212,7 @@ pub enum DeviceManagerError {
 
     /// Cannot create a VFIO device
     #[cfg(feature = "pci_support")]
-    VfioCreate(vfio::VfioError),
+    VfioCreate(vfio_ioctls::VfioError),
 
     /// Cannot create a VFIO PCI device
     #[cfg(feature = "pci_support")]

vmm/src/vm.rs

@@ -20,7 +20,6 @@ extern crate linux_loader;
 extern crate net_util;
 extern crate signal_hook;
 #[cfg(feature = "pci_support")]
-extern crate vfio;
 extern crate vm_allocator;
 extern crate vm_memory;
 extern crate vm_virtio;