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

vmm: config: Switch GenericVhostUserConfig to use PciDeviceCommonConfig

Browse Source 
Switch GenericVhostUserConfig over to using the newly extracted struct
members as used by all PCI based devices. The use of #[serde(flatten)]
means that this change has no impact on the JSON format that the data is
stored as.

As generic vhost-user devices do not support being placed behind an
IOMMU an error is now raised if iommu is set. This can't happen via the
CLI but could via the JSON/API.

Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Rob Bradford
2026-04-03 11:59:42 -07:00
parent 40150dd72d
commit 0d3080e036
3 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vmm/src/device_manager.rs
View File

@@ -3150,11 +3150,11 @@ impl DeviceManager {
&mut self,
generic_vhost_user_cfg: &mut GenericVhostUserConfig,
) -> DeviceManagerResult<MetaVirtioDevice> {
let id = if let Some(id) = &generic_vhost_user_cfg.id {
let id = if let Some(id) = &generic_vhost_user_cfg.pci_common.id {
id.clone()
} else {
let id = self.next_device_name(GENERIC_VHOST_USER_DEVICE_NAME_PREFIX)?;
generic_vhost_user_cfg.id = Some(id.clone());
generic_vhost_user_cfg.pci_common.id = Some(id.clone());
id
};
@@ -3191,7 +3191,7 @@ impl DeviceManager {
as Arc<Mutex<dyn virtio_devices::VirtioDevice>>,
iommu: false,
id,
pci_segment: generic_vhost_user_cfg.pci_segment,
pci_segment: generic_vhost_user_cfg.pci_common.pci_segment,
dma_handler: None,
})
} else {
@@ -5049,7 +5049,7 @@ impl DeviceManager {
&mut self,
generic_vhost_user_cfg: &mut GenericVhostUserConfig,
) -> DeviceManagerResult<PciDeviceInfo> {
self.validate_identifier(&generic_vhost_user_cfg.id)?;
self.validate_identifier(&generic_vhost_user_cfg.pci_common.id)?;
let device = self.make_generic_vhost_user_device(generic_vhost_user_cfg)?;
self.hotplug_virtio_pci_device(device)