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 DiskConfig to use PciDeviceCommonConfig

Browse Source 
Switch DiskConfig 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.

Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Rob Bradford
2026-04-03 11:18:09 -07:00
parent a96da9d4bc
commit d2ce7667bc
3 changed files with 46 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vmm/src/device_manager.rs
View File

@@ -2636,11 +2636,11 @@ impl DeviceManager {
disk_cfg: &mut DiskConfig,
is_hotplug: bool,
) -> DeviceManagerResult<MetaVirtioDevice> {
let id = if let Some(id) = &disk_cfg.id {
let id = if let Some(id) = &disk_cfg.pci_common.id {
id.clone()
} else {
let id = self.next_device_name(DISK_DEVICE_NAME_PREFIX)?;
disk_cfg.id = Some(id.clone());
disk_cfg.pci_common.id = Some(id.clone());
id
};
@@ -2822,7 +2822,7 @@ impl DeviceManager {
let bw = rate_limiter_cfg.bandwidth.unwrap_or_default();
let ops = rate_limiter_cfg.ops.unwrap_or_default();
let mut rate_limit_group = RateLimiterGroup::new(
disk_cfg.id.as_ref().unwrap(),
disk_cfg.pci_common.id.as_ref().unwrap(),
bw.size,
bw.one_time_burst.unwrap_or(0),
bw.refill_time,
@@ -2865,7 +2865,7 @@ impl DeviceManager {
.ok_or(DeviceManagerError::NoDiskPath)?
.clone(),
disk_cfg.readonly,
self.force_iommu | disk_cfg.iommu,
self.force_iommu | disk_cfg.pci_common.iommu,
disk_cfg.num_queues,
disk_cfg.queue_size,
disk_cfg.serial.clone(),
@@ -2913,9 +2913,9 @@ impl DeviceManager {
Ok(MetaVirtioDevice {
virtio_device,
iommu: disk_cfg.iommu,
iommu: disk_cfg.pci_common.iommu,
id,
pci_segment: disk_cfg.pci_segment,
pci_segment: disk_cfg.pci_common.pci_segment,
dma_handler: None,
})
}
@@ -5028,9 +5028,9 @@ impl DeviceManager {
}
pub fn add_disk(&mut self, disk_cfg: &mut DiskConfig) -> DeviceManagerResult<PciDeviceInfo> {
self.validate_identifier(&disk_cfg.id)?;
self.validate_identifier(&disk_cfg.pci_common.id)?;
if disk_cfg.iommu && !self.is_iommu_segment(disk_cfg.pci_segment) {
if disk_cfg.pci_common.iommu && !self.is_iommu_segment(disk_cfg.pci_common.pci_segment) {
return Err(DeviceManagerError::InvalidIommuHotplug);
}