External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-22 04:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Remove io_uring feature flag

Browse Source 
This has been part of the default features for a long time and is widely
tested.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-12-17 11:18:10 +00:00 committed by Sebastien Boeuf
parent 4a47cdcebd
commit 7bb828ecf2
5 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -51,13 +51,12 @@ wait-timeout = "0.2.0"
[features] [features]
default = ["common", "kvm"] default = ["common", "kvm"]
# Common features for all hypervisors # Common features for all hypervisors
common = ["acpi", "cmos", "fwdebug", "io_uring"] common = ["acpi", "cmos", "fwdebug"]
acpi = ["vmm/acpi"] acpi = ["vmm/acpi"]
cmos = ["vmm/cmos"] cmos = ["vmm/cmos"]
fwdebug = ["vmm/fwdebug"] fwdebug = ["vmm/fwdebug"]
kvm = ["vmm/kvm"] kvm = ["vmm/kvm"]
mshv = ["vmm/mshv"] mshv = ["vmm/mshv"]
io_uring = ["vmm/io_uring"]
tdx = ["vmm/tdx"] tdx = ["vmm/tdx"]
# Integration tests require a special environment to run in # Integration tests require a special environment to run in

1
block_util/Cargo.toml
View File

@ -6,7 +6,6 @@ edition = "2018"
[features] [features]
default = [] default = []
io_uring = []
[dependencies] [dependencies]
io-uring = "0.5.2" io-uring = "0.5.2"

7
block_util/src/lib.rs
View File

@ -21,7 +21,6 @@ pub mod vhd;
pub mod vhdx_sync; pub mod vhdx_sync;
use crate::async_io::{AsyncIo, AsyncIoError, AsyncIoResult}; use crate::async_io::{AsyncIo, AsyncIoError, AsyncIoResult};
#[cfg(feature = "io_uring")]
use io_uring::{opcode, IoUring, Probe}; use io_uring::{opcode, IoUring, Probe};
use std::cmp; use std::cmp;
use std::convert::TryInto; use std::convert::TryInto;
@ -423,7 +422,6 @@ unsafe impl ByteValued for VirtioBlockGeometry {}
/// Check if io_uring for block device can be used on the current system, as /// Check if io_uring for block device can be used on the current system, as
/// it correctly supports the expected io_uring features. /// it correctly supports the expected io_uring features.
#[cfg(feature = "io_uring")]
pub fn block_io_uring_is_supported() -> bool { pub fn block_io_uring_is_supported() -> bool {
let error_msg = "io_uring not supported:"; let error_msg = "io_uring not supported:";
@ -471,11 +469,6 @@ pub fn block_io_uring_is_supported() -> bool {
true true
} }
#[cfg(not(feature = "io_uring"))]
pub fn block_io_uring_is_supported() -> bool {
false
}
pub trait AsyncAdaptor<F> pub trait AsyncAdaptor<F>
where where
F: Read + Write + Seek, F: Read + Write + Seek,

1
virtio-devices/Cargo.toml
View File

@ -6,7 +6,6 @@ edition = "2018"
[features] [features]
default = [] default = []
io_uring = ["block_util/io_uring"]
mshv = [] mshv = []
[dependencies] [dependencies]

1
vmm/Cargo.toml
View File

@ -11,7 +11,6 @@ cmos = ["devices/cmos"]
fwdebug = ["devices/fwdebug"] fwdebug = ["devices/fwdebug"]
kvm = ["hypervisor/kvm", "vfio-ioctls/kvm", "vm-device/kvm", "pci/kvm"] kvm = ["hypervisor/kvm", "vfio-ioctls/kvm", "vm-device/kvm", "pci/kvm"]
mshv = ["hypervisor/mshv", "virtio-devices/mshv", "vfio-ioctls/mshv", "vm-device/mshv", "pci/mshv"] mshv = ["hypervisor/mshv", "virtio-devices/mshv", "vfio-ioctls/mshv", "vm-device/mshv", "pci/mshv"]
io_uring = ["virtio-devices/io_uring"]
tdx = ["arch/tdx", "hypervisor/tdx"] tdx = ["arch/tdx", "hypervisor/tdx"]
[dependencies] [dependencies]