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, docs: make PCI BDF configurable for ivshmem

Browse Source 
Add shared PCI config to ivshmem.

On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
This commit is contained in:
Philipp Schuster
2026-05-19 14:59:35 +02:00
committed by Rob Bradford
parent 5aa0587f2a
commit 212986f013
4 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/device_manager.rs
+27 -7
View File
@@ -1560,8 +1560,11 @@ impl DeviceManager {
}
#[cfg(feature = "ivshmem")]
if let Some(ivshmem) = self.config.clone().lock().unwrap().ivshmem.as_ref() {
self.ivshmem_device = self.add_ivshmem_device(ivshmem, snapshot)?;
{
let mut ivshmem = self.config.lock().unwrap().ivshmem.clone();
if let Some(ivshmem) = &mut ivshmem {
self.ivshmem_device = self.add_ivshmem_device(ivshmem, snapshot)?;
}
}
Ok(())
@@ -4481,15 +4484,24 @@ impl DeviceManager {
#[cfg(feature = "ivshmem")]
fn add_ivshmem_device(
&mut self,
ivshmem_cfg: &IvshmemConfig,
ivshmem_cfg: &mut IvshmemConfig,
snapshot: Option<&Snapshot>,
) -> DeviceManagerResult<Option<Arc<Mutex<devices::IvshmemDevice>>>> {
let id = String::from(IVSHMEM_DEVICE_NAME);
let pci_segment_id = 0x0_u16;
let id = match ivshmem_cfg.pci_common.id.as_ref() {
Some(id) => id.clone(),
None => ivshmem_cfg
.pci_common
.id
.insert(IVSHMEM_DEVICE_NAME.to_string())
.clone(),
};
info!("Creating ivshmem device {id}");
let (pci_segment_id, pci_device_bdf, resources) =
self.pci_resources(&id, pci_segment_id, None)?;
let (pci_segment_id, pci_device_bdf, resources) = self.pci_resources(
&id,
ivshmem_cfg.pci_common.pci_segment,
ivshmem_cfg.pci_common.pci_device_id,
)?;
let snapshot = snapshot_from_id(snapshot, id.as_str());
let ivshmem_ops = Arc::new(Mutex::new(IvshmemHandler {
@@ -4558,6 +4570,14 @@ impl DeviceManager {
}
}
#[cfg(feature = "ivshmem")]
if let Some(ivshmem_cfg) = &config.ivshmem
&& let Some(device_id) = ivshmem_cfg.pci_common.pci_device_id
{
self.pci_segments[ivshmem_cfg.pci_common.pci_segment as usize]
.reserve_device_id(device_id)?;
}
Ok(())
}