kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: Rename VIRTIO_F_IOMMU_PLATFORM

Browse Source 
Rename the transport feature bit constant from
VIRTIO_F_IOMMU_PLATFORM to VIRTIO_F_ACCESS_PLATFORM across
the entire virtio-devices crate.

The virtio specification as of v1.1 carries bit 33 as
VIRTIO_F_ACCESS_PLATFORM. The Linux kernel UAPI header
<linux/virtio_config.h> carries VIRTIO_F_IOMMU_PLATFORM
only as a backward-compatible alias.

This is a pure rename with no functional or behavioral
change.

Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
This commit is contained in:
Anatol Belski
2026-03-07 12:01:25 +01:00
committed by Rob Bradford
parent 313d980538
commit da0d0a2090
12 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
virtio-devices/src/block.rs
+1 -1
View File
@@ -737,7 +737,7 @@ impl Block {
} }
if iommu { if iommu {
avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM;
} }
if read_only { if read_only {
virtio-devices/src/console.rs
+2 -2
View File
@@ -25,7 +25,7 @@ use vmm_sys_util::eventfd::EventFd;
use super::{ use super::{
ActivateResult, EPOLL_HELPER_EVENT_LAST, EpollHelper, EpollHelperError, EpollHelperHandler, 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, VirtioDeviceType, VirtioInterruptType,
}; };
use crate::seccomp_filters::Thread; use crate::seccomp_filters::Thread;
@@ -609,7 +609,7 @@ impl Console {
} else { } else {
let mut avail_features = (1u64 << VIRTIO_F_VERSION_1) | (1u64 << VIRTIO_CONSOLE_F_SIZE); let mut avail_features = (1u64 << VIRTIO_F_VERSION_1) | (1u64 << VIRTIO_CONSOLE_F_SIZE);
if iommu { if iommu {
avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM;
} }
( (
virtio-devices/src/lib.rs
+1 -1
View File
@@ -71,7 +71,7 @@ const DEVICE_FAILED: u32 = 0x80;
const VIRTIO_F_RING_INDIRECT_DESC: u32 = 28; const VIRTIO_F_RING_INDIRECT_DESC: u32 = 28;
const VIRTIO_F_RING_EVENT_IDX: u32 = 29; const VIRTIO_F_RING_EVENT_IDX: u32 = 29;
const VIRTIO_F_VERSION_1: u32 = 32; 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_IN_ORDER: u32 = 35;
const VIRTIO_F_ORDER_PLATFORM: u32 = 36; const VIRTIO_F_ORDER_PLATFORM: u32 = 36;
#[allow(dead_code)] #[allow(dead_code)]
virtio-devices/src/net.rs
+1 -1
View File
@@ -463,7 +463,7 @@ impl Net {
| (1 << VIRTIO_F_VERSION_1); | (1 << VIRTIO_F_VERSION_1);
if iommu { 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. // Configure TSO/UFO features when hardware checksum offload is enabled.
virtio-devices/src/pmem.rs
+2 -2
View File
@@ -31,7 +31,7 @@ use vmm_sys_util::eventfd::EventFd;
use super::{ use super::{
ActivateError, ActivateResult, EPOLL_HELPER_EVENT_LAST, EpollHelper, EpollHelperError, 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, VirtioCommon, VirtioDevice, VirtioDeviceType,
}; };
use crate::seccomp_filters::Thread; use crate::seccomp_filters::Thread;
@@ -307,7 +307,7 @@ impl Pmem {
let mut avail_features = 1u64 << VIRTIO_F_VERSION_1; let mut avail_features = 1u64 << VIRTIO_F_VERSION_1;
if iommu { if iommu {
avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM;
} }
(avail_features, 0, config, false) (avail_features, 0, config, false)
}; };
virtio-devices/src/rng.rs
+2 -2
View File
@@ -24,7 +24,7 @@ use vmm_sys_util::eventfd::EventFd;
use super::{ use super::{
ActivateError, ActivateResult, EPOLL_HELPER_EVENT_LAST, EpollHelper, EpollHelperError, 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, VirtioCommon, VirtioDevice, VirtioDeviceType,
}; };
use crate::seccomp_filters::Thread; use crate::seccomp_filters::Thread;
@@ -180,7 +180,7 @@ impl Rng {
let mut avail_features = 1u64 << VIRTIO_F_VERSION_1; let mut avail_features = 1u64 << VIRTIO_F_VERSION_1;
if iommu { if iommu {
avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM;
} }
(avail_features, 0, false) (avail_features, 0, false)
virtio-devices/src/vdpa.rs
+2 -2
View File
@@ -28,7 +28,7 @@ use vmm_sys_util::eventfd::EventFd;
use crate::{ use crate::{
ActivateError, ActivateResult, DEVICE_ACKNOWLEDGE, DEVICE_DRIVER, DEVICE_DRIVER_OK, 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, VirtioInterrupt, VirtioInterruptType, get_host_address_range,
}; };
@@ -164,7 +164,7 @@ impl Vdpa {
let iova_range = vhost.get_iova_range().map_err(Error::GetIovaRange)?; 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); return Err(Error::MissingAccessPlatformVirtioFeature);
} }
virtio-devices/src/vhost_user/blk.rs
+2 -2
View File
@@ -31,7 +31,7 @@ use super::{DEFAULT_VIRTIO_FEATURES, Error, Result};
use crate::seccomp_filters::Thread; use crate::seccomp_filters::Thread;
use crate::thread_helper::spawn_virtio_thread; use crate::thread_helper::spawn_virtio_thread;
use crate::vhost_user::VhostUserCommon; 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; const DEFAULT_QUEUE_NUMBER: usize = 1;
@@ -239,7 +239,7 @@ impl VirtioDevice for Blk {
fn features(&self) -> u64 { fn features(&self) -> u64 {
let mut features = self.common.avail_features; let mut features = self.common.avail_features;
if self.iommu { if self.iommu {
features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM;
} }
features features
} }
virtio-devices/src/vhost_user/fs.rs
+2 -2
View File
@@ -25,7 +25,7 @@ use crate::seccomp_filters::Thread;
use crate::thread_helper::spawn_virtio_thread; use crate::thread_helper::spawn_virtio_thread;
use crate::vhost_user::VhostUserCommon; use crate::vhost_user::VhostUserCommon;
use crate::{ use crate::{
ActivateResult, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VIRTIO_F_IOMMU_PLATFORM, ActivateResult, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VIRTIO_F_ACCESS_PLATFORM,
VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterrupt, VirtioSharedMemoryList, VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterrupt, VirtioSharedMemoryList,
}; };
@@ -248,7 +248,7 @@ impl VirtioDevice for Fs {
fn features(&self) -> u64 { fn features(&self) -> u64 {
let mut features = self.common.avail_features; let mut features = self.common.avail_features;
if self.iommu { if self.iommu {
features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM;
} }
features features
} }
virtio-devices/src/vhost_user/generic_vhost_user.rs
+2 -2
View File
@@ -27,7 +27,7 @@ use crate::seccomp_filters::Thread;
use crate::thread_helper::spawn_virtio_thread; use crate::thread_helper::spawn_virtio_thread;
use crate::vhost_user::VhostUserCommon; use crate::vhost_user::VhostUserCommon;
use crate::{ use crate::{
ActivateResult, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VIRTIO_F_IOMMU_PLATFORM, ActivateResult, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VIRTIO_F_ACCESS_PLATFORM,
VirtioCommon, VirtioDevice, VirtioInterrupt, VirtioSharedMemoryList, VirtioCommon, VirtioDevice, VirtioInterrupt, VirtioSharedMemoryList,
}; };
@@ -218,7 +218,7 @@ impl VirtioDevice for GenericVhostUser {
fn features(&self) -> u64 { fn features(&self) -> u64 {
let mut features = self.common.avail_features; let mut features = self.common.avail_features;
if self.iommu { if self.iommu {
features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM;
} }
features features
} }
virtio-devices/src/vhost_user/net.rs
+3 -3
View File
@@ -30,8 +30,8 @@ use crate::thread_helper::spawn_virtio_thread;
use crate::vhost_user::vu_common_ctrl::{VhostUserConfig, VhostUserHandle}; use crate::vhost_user::vu_common_ctrl::{VhostUserConfig, VhostUserHandle};
use crate::vhost_user::{DEFAULT_VIRTIO_FEATURES, Error, Result, VhostUserCommon}; use crate::vhost_user::{DEFAULT_VIRTIO_FEATURES, Error, Result, VhostUserCommon};
use crate::{ use crate::{
ActivateResult, GuestMemoryMmap, GuestRegionMmap, NetCtrlEpollHandler, VIRTIO_F_IOMMU_PLATFORM, ActivateResult, GuestMemoryMmap, GuestRegionMmap, NetCtrlEpollHandler,
VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterrupt, VIRTIO_F_ACCESS_PLATFORM, VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterrupt,
}; };
const DEFAULT_QUEUE_NUMBER: usize = 2; const DEFAULT_QUEUE_NUMBER: usize = 2;
@@ -275,7 +275,7 @@ impl VirtioDevice for Net {
fn features(&self) -> u64 { fn features(&self) -> u64 {
let mut features = self.common.avail_features; let mut features = self.common.avail_features;
if self.iommu { if self.iommu {
features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM;
} }
features features
} }
virtio-devices/src/vsock/device.rs
+2 -2
View File
@@ -50,7 +50,7 @@ use crate::seccomp_filters::Thread;
use crate::thread_helper::spawn_virtio_thread; use crate::thread_helper::spawn_virtio_thread;
use crate::{ use crate::{
ActivateResult, EPOLL_HELPER_EVENT_LAST, EpollHelper, EpollHelperError, EpollHelperHandler, 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, VIRTIO_F_VERSION_1, VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterrupt,
VirtioInterruptType, VirtioInterruptType,
}; };
@@ -349,7 +349,7 @@ where
let mut avail_features = (1u64 << VIRTIO_F_VERSION_1) | (1u64 << VIRTIO_F_IN_ORDER); let mut avail_features = (1u64 << VIRTIO_F_VERSION_1) | (1u64 << VIRTIO_F_IN_ORDER);
if iommu { if iommu {
avail_features |= 1u64 << VIRTIO_F_IOMMU_PLATFORM; avail_features |= 1u64 << VIRTIO_F_ACCESS_PLATFORM;
} }
(avail_features, 0, false) (avail_features, 0, false)
}; };