mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-01 11:05:46 +00:00
vfio: Rename to vfio-ioctls
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
53ce529875
commit
d24aa72d3e
22
Cargo.lock
generated
22
Cargo.lock
generated
@ -690,8 +690,8 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"vfio",
|
|
||||||
"vfio-bindings",
|
"vfio-bindings",
|
||||||
|
"vfio-ioctls",
|
||||||
"vm-allocator",
|
"vm-allocator",
|
||||||
"vm-device",
|
"vm-device",
|
||||||
"vm-memory",
|
"vm-memory",
|
||||||
@ -1345,7 +1345,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vfio"
|
name = "vfio-bindings"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "git+https://github.com/rust-vmm/vfio-bindings#f08cbcbf4041c981441d9c036c49ebad5098ed1c"
|
||||||
|
dependencies = [
|
||||||
|
"vmm-sys-util",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "vfio-ioctls"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -1360,14 +1368,6 @@ dependencies = [
|
|||||||
"vmm-sys-util",
|
"vmm-sys-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "vfio-bindings"
|
|
||||||
version = "0.2.0"
|
|
||||||
source = "git+https://github.com/rust-vmm/vfio-bindings#f08cbcbf4041c981441d9c036c49ebad5098ed1c"
|
|
||||||
dependencies = [
|
|
||||||
"vmm-sys-util",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vhost"
|
name = "vhost"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
@ -1547,7 +1547,7 @@ dependencies = [
|
|||||||
"signal-hook",
|
"signal-hook",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"url",
|
"url",
|
||||||
"vfio",
|
"vfio-ioctls",
|
||||||
"vm-allocator",
|
"vm-allocator",
|
||||||
"vm-device",
|
"vm-device",
|
||||||
"vm-memory",
|
"vm-memory",
|
||||||
|
@ -63,7 +63,7 @@ members = [
|
|||||||
"vhost_user_backend",
|
"vhost_user_backend",
|
||||||
"vhost_user_fs",
|
"vhost_user_fs",
|
||||||
"vhost_user_net",
|
"vhost_user_net",
|
||||||
"vfio",
|
"vfio-ioctls",
|
||||||
"net_util",
|
"net_util",
|
||||||
"acpi_tables",
|
"acpi_tables",
|
||||||
"arch_gen",
|
"arch_gen",
|
||||||
|
@ -10,7 +10,7 @@ byteorder = "1.3.4"
|
|||||||
devices = { path = "../devices" }
|
devices = { path = "../devices" }
|
||||||
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch" }
|
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch" }
|
||||||
kvm-ioctls = { git = "https://github.com/cloud-hypervisor/kvm-ioctls", branch = "ch" }
|
kvm-ioctls = { git = "https://github.com/cloud-hypervisor/kvm-ioctls", branch = "ch" }
|
||||||
vfio = { path = "../vfio" }
|
vfio-ioctls = { path = "../vfio-ioctls" }
|
||||||
vmm-sys-util = ">=0.3.1"
|
vmm-sys-util = ">=0.3.1"
|
||||||
libc = "0.2.71"
|
libc = "0.2.71"
|
||||||
log = "0.4.8"
|
log = "0.4.8"
|
||||||
|
@ -20,8 +20,8 @@ use std::os::unix::io::AsRawFd;
|
|||||||
use std::ptr::null_mut;
|
use std::ptr::null_mut;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::{fmt, io, result};
|
use std::{fmt, io, result};
|
||||||
use vfio::{VfioDevice, VfioError};
|
|
||||||
use vfio_bindings::bindings::vfio::*;
|
use vfio_bindings::bindings::vfio::*;
|
||||||
|
use vfio_ioctls::{VfioDevice, VfioError};
|
||||||
use vm_allocator::SystemAllocator;
|
use vm_allocator::SystemAllocator;
|
||||||
use vm_device::interrupt::{
|
use vm_device::interrupt::{
|
||||||
InterruptIndex, InterruptManager, InterruptSourceGroup, MsiIrqGroupConfig,
|
InterruptIndex, InterruptManager, InterruptSourceGroup, MsiIrqGroupConfig,
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "vfio"
|
name = "vfio-ioctls"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
authors = ["The Cloud Hypervisor Authors"]
|
authors = ["The Cloud Hypervisor Authors"]
|
||||||
|
|
@ -7,7 +7,7 @@ edition = "2018"
|
|||||||
[features]
|
[features]
|
||||||
default = []
|
default = []
|
||||||
acpi = ["acpi_tables","devices/acpi", "arch/acpi"]
|
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"]
|
mmio_support = ["vm-virtio/mmio_support"]
|
||||||
cmos = ["devices/cmos"]
|
cmos = ["devices/cmos"]
|
||||||
fwdebug = ["devices/fwdebug"]
|
fwdebug = ["devices/fwdebug"]
|
||||||
@ -34,7 +34,7 @@ serde = {version = ">=1.0.27", features = ["rc"] }
|
|||||||
serde_derive = ">=1.0.27"
|
serde_derive = ">=1.0.27"
|
||||||
serde_json = ">=1.0.9"
|
serde_json = ">=1.0.9"
|
||||||
url = "2.1.1"
|
url = "2.1.1"
|
||||||
vfio = { path = "../vfio", optional = true }
|
vfio-ioctls = { path = "../vfio-ioctls", optional = true }
|
||||||
vm-allocator = { path = "../vm-allocator" }
|
vm-allocator = { path = "../vm-allocator" }
|
||||||
vm-device = { path = "../vm-device" }
|
vm-device = { path = "../vm-device" }
|
||||||
vm-memory = { version = "0.2.1", features = ["backend-mmap", "backend-atomic"] }
|
vm-memory = { version = "0.2.1", features = ["backend-mmap", "backend-atomic"] }
|
||||||
|
@ -55,7 +55,7 @@ use std::result;
|
|||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
use tempfile::NamedTempFile;
|
use tempfile::NamedTempFile;
|
||||||
#[cfg(feature = "pci_support")]
|
#[cfg(feature = "pci_support")]
|
||||||
use vfio::{VfioDevice, VfioDmaMapping};
|
use vfio_ioctls::{VfioDevice, VfioDmaMapping};
|
||||||
use vm_allocator::SystemAllocator;
|
use vm_allocator::SystemAllocator;
|
||||||
use vm_device::interrupt::{
|
use vm_device::interrupt::{
|
||||||
InterruptIndex, InterruptManager, LegacyIrqGroupConfig, MsiIrqGroupConfig,
|
InterruptIndex, InterruptManager, LegacyIrqGroupConfig, MsiIrqGroupConfig,
|
||||||
@ -212,7 +212,7 @@ pub enum DeviceManagerError {
|
|||||||
|
|
||||||
/// Cannot create a VFIO device
|
/// Cannot create a VFIO device
|
||||||
#[cfg(feature = "pci_support")]
|
#[cfg(feature = "pci_support")]
|
||||||
VfioCreate(vfio::VfioError),
|
VfioCreate(vfio_ioctls::VfioError),
|
||||||
|
|
||||||
/// Cannot create a VFIO PCI device
|
/// Cannot create a VFIO PCI device
|
||||||
#[cfg(feature = "pci_support")]
|
#[cfg(feature = "pci_support")]
|
||||||
|
@ -20,7 +20,6 @@ extern crate linux_loader;
|
|||||||
extern crate net_util;
|
extern crate net_util;
|
||||||
extern crate signal_hook;
|
extern crate signal_hook;
|
||||||
#[cfg(feature = "pci_support")]
|
#[cfg(feature = "pci_support")]
|
||||||
extern crate vfio;
|
|
||||||
extern crate vm_allocator;
|
extern crate vm_allocator;
|
||||||
extern crate vm_memory;
|
extern crate vm_memory;
|
||||||
extern crate vm_virtio;
|
extern crate vm_virtio;
|
||||||
|
Loading…
Reference in New Issue
Block a user