diff --git a/virtio-devices/src/block.rs b/virtio-devices/src/block.rs index 0d2b1fb27..9d09ab91a 100644 --- a/virtio-devices/src/block.rs +++ b/virtio-devices/src/block.rs @@ -737,7 +737,7 @@ impl Block { } if iommu { - avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; + avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM; } if read_only { diff --git a/virtio-devices/src/console.rs b/virtio-devices/src/console.rs index c8a9f08a0..7896fde9f 100644 --- a/virtio-devices/src/console.rs +++ b/virtio-devices/src/console.rs @@ -25,7 +25,7 @@ use vmm_sys_util::eventfd::EventFd; use super::{ ActivateResult, EPOLL_HELPER_EVENT_LAST, EpollHelper, EpollHelperError, EpollHelperHandler, - Error as DeviceError, VIRTIO_F_IOMMU_PLATFORM, VIRTIO_F_VERSION_1, VirtioCommon, VirtioDevice, + Error as DeviceError, VIRTIO_F_ACCESS_PLATFORM, VIRTIO_F_VERSION_1, VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterruptType, }; use crate::seccomp_filters::Thread; @@ -609,7 +609,7 @@ impl Console { } else { let mut avail_features = (1u64 << VIRTIO_F_VERSION_1) | (1u64 << VIRTIO_CONSOLE_F_SIZE); if iommu { - avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; + avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM; } ( diff --git a/virtio-devices/src/lib.rs b/virtio-devices/src/lib.rs index da4f1c91b..111c9007e 100644 --- a/virtio-devices/src/lib.rs +++ b/virtio-devices/src/lib.rs @@ -71,7 +71,7 @@ const DEVICE_FAILED: u32 = 0x80; const VIRTIO_F_RING_INDIRECT_DESC: u32 = 28; const VIRTIO_F_RING_EVENT_IDX: u32 = 29; const VIRTIO_F_VERSION_1: u32 = 32; -const VIRTIO_F_IOMMU_PLATFORM: u32 = 33; +const VIRTIO_F_ACCESS_PLATFORM: u32 = 33; const VIRTIO_F_IN_ORDER: u32 = 35; const VIRTIO_F_ORDER_PLATFORM: u32 = 36; #[allow(dead_code)] diff --git a/virtio-devices/src/net.rs b/virtio-devices/src/net.rs index 8eee66134..63b9de411 100644 --- a/virtio-devices/src/net.rs +++ b/virtio-devices/src/net.rs @@ -463,7 +463,7 @@ impl Net { | (1 << VIRTIO_F_VERSION_1); if iommu { - avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; + avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM; } // Configure TSO/UFO features when hardware checksum offload is enabled. diff --git a/virtio-devices/src/pmem.rs b/virtio-devices/src/pmem.rs index 549b62fd9..b7be248fa 100644 --- a/virtio-devices/src/pmem.rs +++ b/virtio-devices/src/pmem.rs @@ -31,7 +31,7 @@ use vmm_sys_util::eventfd::EventFd; use super::{ ActivateError, ActivateResult, EPOLL_HELPER_EVENT_LAST, EpollHelper, EpollHelperError, - EpollHelperHandler, Error as DeviceError, VIRTIO_F_IOMMU_PLATFORM, VIRTIO_F_VERSION_1, + EpollHelperHandler, Error as DeviceError, VIRTIO_F_ACCESS_PLATFORM, VIRTIO_F_VERSION_1, VirtioCommon, VirtioDevice, VirtioDeviceType, }; use crate::seccomp_filters::Thread; @@ -307,7 +307,7 @@ impl Pmem { let mut avail_features = 1u64 << VIRTIO_F_VERSION_1; if iommu { - avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; + avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM; } (avail_features, 0, config, false) }; diff --git a/virtio-devices/src/rng.rs b/virtio-devices/src/rng.rs index 2f980d4d8..2409e272c 100644 --- a/virtio-devices/src/rng.rs +++ b/virtio-devices/src/rng.rs @@ -24,7 +24,7 @@ use vmm_sys_util::eventfd::EventFd; use super::{ ActivateError, ActivateResult, EPOLL_HELPER_EVENT_LAST, EpollHelper, EpollHelperError, - EpollHelperHandler, Error as DeviceError, VIRTIO_F_IOMMU_PLATFORM, VIRTIO_F_VERSION_1, + EpollHelperHandler, Error as DeviceError, VIRTIO_F_ACCESS_PLATFORM, VIRTIO_F_VERSION_1, VirtioCommon, VirtioDevice, VirtioDeviceType, }; use crate::seccomp_filters::Thread; @@ -180,7 +180,7 @@ impl Rng { let mut avail_features = 1u64 << VIRTIO_F_VERSION_1; if iommu { - avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; + avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM; } (avail_features, 0, false) diff --git a/virtio-devices/src/vdpa.rs b/virtio-devices/src/vdpa.rs index 725f215c7..9d20aac92 100644 --- a/virtio-devices/src/vdpa.rs +++ b/virtio-devices/src/vdpa.rs @@ -28,7 +28,7 @@ use vmm_sys_util::eventfd::EventFd; use crate::{ ActivateError, ActivateResult, DEVICE_ACKNOWLEDGE, DEVICE_DRIVER, DEVICE_DRIVER_OK, - DEVICE_FEATURES_OK, GuestMemoryMmap, VIRTIO_F_IOMMU_PLATFORM, VirtioCommon, VirtioDevice, + DEVICE_FEATURES_OK, GuestMemoryMmap, VIRTIO_F_ACCESS_PLATFORM, VirtioCommon, VirtioDevice, VirtioInterrupt, VirtioInterruptType, get_host_address_range, }; @@ -164,7 +164,7 @@ impl Vdpa { let iova_range = vhost.get_iova_range().map_err(Error::GetIovaRange)?; - if avail_features & (1u64 << VIRTIO_F_IOMMU_PLATFORM) == 0 { + if avail_features & (1u64 << VIRTIO_F_ACCESS_PLATFORM) == 0 { return Err(Error::MissingAccessPlatformVirtioFeature); } diff --git a/virtio-devices/src/vhost_user/blk.rs b/virtio-devices/src/vhost_user/blk.rs index d26350c91..22896ba7c 100644 --- a/virtio-devices/src/vhost_user/blk.rs +++ b/virtio-devices/src/vhost_user/blk.rs @@ -31,7 +31,7 @@ use super::{DEFAULT_VIRTIO_FEATURES, Error, Result}; use crate::seccomp_filters::Thread; use crate::thread_helper::spawn_virtio_thread; use crate::vhost_user::VhostUserCommon; -use crate::{GuestMemoryMmap, GuestRegionMmap, VIRTIO_F_IOMMU_PLATFORM, VirtioInterrupt}; +use crate::{GuestMemoryMmap, GuestRegionMmap, VIRTIO_F_ACCESS_PLATFORM, VirtioInterrupt}; const DEFAULT_QUEUE_NUMBER: usize = 1; @@ -239,7 +239,7 @@ impl VirtioDevice for Blk { fn features(&self) -> u64 { let mut features = self.common.avail_features; if self.iommu { - features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; + features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM; } features } diff --git a/virtio-devices/src/vhost_user/fs.rs b/virtio-devices/src/vhost_user/fs.rs index d0005af90..434454fce 100644 --- a/virtio-devices/src/vhost_user/fs.rs +++ b/virtio-devices/src/vhost_user/fs.rs @@ -25,7 +25,7 @@ use crate::seccomp_filters::Thread; use crate::thread_helper::spawn_virtio_thread; use crate::vhost_user::VhostUserCommon; use crate::{ - ActivateResult, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VIRTIO_F_IOMMU_PLATFORM, + ActivateResult, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VIRTIO_F_ACCESS_PLATFORM, VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterrupt, VirtioSharedMemoryList, }; @@ -248,7 +248,7 @@ impl VirtioDevice for Fs { fn features(&self) -> u64 { let mut features = self.common.avail_features; if self.iommu { - features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; + features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM; } features } diff --git a/virtio-devices/src/vhost_user/generic_vhost_user.rs b/virtio-devices/src/vhost_user/generic_vhost_user.rs index 5774af928..d38eee3a9 100644 --- a/virtio-devices/src/vhost_user/generic_vhost_user.rs +++ b/virtio-devices/src/vhost_user/generic_vhost_user.rs @@ -27,7 +27,7 @@ use crate::seccomp_filters::Thread; use crate::thread_helper::spawn_virtio_thread; use crate::vhost_user::VhostUserCommon; use crate::{ - ActivateResult, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VIRTIO_F_IOMMU_PLATFORM, + ActivateResult, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VIRTIO_F_ACCESS_PLATFORM, VirtioCommon, VirtioDevice, VirtioInterrupt, VirtioSharedMemoryList, }; @@ -218,7 +218,7 @@ impl VirtioDevice for GenericVhostUser { fn features(&self) -> u64 { let mut features = self.common.avail_features; if self.iommu { - features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; + features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM; } features } diff --git a/virtio-devices/src/vhost_user/net.rs b/virtio-devices/src/vhost_user/net.rs index e0a71c734..187d710e3 100644 --- a/virtio-devices/src/vhost_user/net.rs +++ b/virtio-devices/src/vhost_user/net.rs @@ -30,8 +30,8 @@ use crate::thread_helper::spawn_virtio_thread; use crate::vhost_user::vu_common_ctrl::{VhostUserConfig, VhostUserHandle}; use crate::vhost_user::{DEFAULT_VIRTIO_FEATURES, Error, Result, VhostUserCommon}; use crate::{ - ActivateResult, GuestMemoryMmap, GuestRegionMmap, NetCtrlEpollHandler, VIRTIO_F_IOMMU_PLATFORM, - VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterrupt, + ActivateResult, GuestMemoryMmap, GuestRegionMmap, NetCtrlEpollHandler, + VIRTIO_F_ACCESS_PLATFORM, VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterrupt, }; const DEFAULT_QUEUE_NUMBER: usize = 2; @@ -275,7 +275,7 @@ impl VirtioDevice for Net { fn features(&self) -> u64 { let mut features = self.common.avail_features; if self.iommu { - features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; + features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM; } features } diff --git a/virtio-devices/src/vsock/device.rs b/virtio-devices/src/vsock/device.rs index 27a0af1ff..aa86aa0c9 100644 --- a/virtio-devices/src/vsock/device.rs +++ b/virtio-devices/src/vsock/device.rs @@ -50,7 +50,7 @@ use crate::seccomp_filters::Thread; use crate::thread_helper::spawn_virtio_thread; use crate::{ ActivateResult, EPOLL_HELPER_EVENT_LAST, EpollHelper, EpollHelperError, EpollHelperHandler, - Error as DeviceError, GuestMemoryMmap, VIRTIO_F_IN_ORDER, VIRTIO_F_IOMMU_PLATFORM, + Error as DeviceError, GuestMemoryMmap, VIRTIO_F_ACCESS_PLATFORM, VIRTIO_F_IN_ORDER, VIRTIO_F_VERSION_1, VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterrupt, VirtioInterruptType, }; @@ -349,7 +349,7 @@ where let mut avail_features = (1u64 << VIRTIO_F_VERSION_1) | (1u64 << VIRTIO_F_IN_ORDER); if iommu { - avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; + avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM; } (avail_features, 0, false) };