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: DeviceConfig: Store path as Option<PathBuf>

Browse Source 
Relax DeviceConfig::path from PathBuf to Option<PathBuf> in preparation
to accept an externally-opened vfio cdev FD. The parser and OpenAPI spec
still enforces that `path` is set, so callers see no behavior change.

Signed-off-by: Bo Chen <bchen@crusoe.ai>
Assisted-by: Claude:Opus-4.7
This commit is contained in:
Bo Chen
2026-04-28 03:48:43 +00:00
committed by Rob Bradford
parent 96ea24339d
commit bc5363823a
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/config.rs
+10 -8
View File
@@ -2442,7 +2442,7 @@ impl DeviceConfig {
.unwrap_or_default();
Ok(DeviceConfig {
pci_common,
path,
path: Some(path),
x_nv_gpudirect_clique,
x_exclude_mmap_bars,
})
@@ -3312,9 +3312,11 @@ impl VmConfig {
if let Some(devices) = &self.devices {
let mut device_paths = BTreeSet::new();
for device in devices {
if !device_paths.insert(device.path.to_string_lossy()) {
if let Some(path) = device.path.as_deref()
&& !device_paths.insert(path.to_string_lossy())
{
return Err(ValidationError::DuplicateDevicePath(
device.path.to_string_lossy().to_string(),
path.to_string_lossy().to_string(),
));
}
@@ -4719,7 +4721,7 @@ id=\"{id}\",pci_segment={pci_segment},queue_sizes={queue_sizes}"
fn device_fixture() -> DeviceConfig {
DeviceConfig {
pci_common: PciDeviceCommonConfig::default(),
path: PathBuf::from("/path/to/device"),
path: Some(PathBuf::from("/path/to/device")),
x_nv_gpudirect_clique: None,
x_exclude_mmap_bars: Vec::new(),
}
@@ -6073,11 +6075,11 @@ id=\"{id}\",pci_segment={pci_segment},queue_sizes={queue_sizes}"
let mut still_valid_config = valid_config.clone();
still_valid_config.devices = Some(vec![
DeviceConfig {
path: "/device1".into(),
path: Some("/device1".into()),
..device_fixture()
},
DeviceConfig {
path: "/device2".into(),
path: Some("/device2".into()),
..device_fixture()
},
]);
@@ -6086,11 +6088,11 @@ id=\"{id}\",pci_segment={pci_segment},queue_sizes={queue_sizes}"
let mut invalid_config = valid_config.clone();
invalid_config.devices = Some(vec![
DeviceConfig {
path: "/device1".into(),
path: Some("/device1".into()),
..device_fixture()
},
DeviceConfig {
path: "/device1".into(),
path: Some("/device1".into()),
..device_fixture()
},
]);