mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-02 11:35:46 +00:00
vmm: Add id field to --device through CLI
Add the ability to specify the "id" associated with a device, by adding an extra option to the parameter --device. This new option is not mandatory, and by default, the VMM will take care of finding a unique identifier. If the identifier provided by the user through this new option is not unique, an error will be thrown and the VM won't be started. Fixes #881 Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
parent
f4a956a60a
commit
9023444ad3
@ -204,7 +204,7 @@ fn create_app<'a, 'b>(
|
|||||||
.help("Direct device assignment parameter")
|
.help("Direct device assignment parameter")
|
||||||
.help(
|
.help(
|
||||||
"Direct device assignment parameters \
|
"Direct device assignment parameters \
|
||||||
\"path=<device_path>,iommu=on|off\"",
|
\"path=<device_path>,iommu=on|off,id=<device_id>\"",
|
||||||
)
|
)
|
||||||
.takes_value(true)
|
.takes_value(true)
|
||||||
.min_values(1)
|
.min_values(1)
|
||||||
|
@ -432,6 +432,8 @@ components:
|
|||||||
iommu:
|
iommu:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
|
id:
|
||||||
|
type: string
|
||||||
|
|
||||||
VsockConfig:
|
VsockConfig:
|
||||||
required:
|
required:
|
||||||
|
@ -900,19 +900,28 @@ impl DeviceConfig {
|
|||||||
|
|
||||||
let mut path_str: &str = "";
|
let mut path_str: &str = "";
|
||||||
let mut iommu_str: &str = "";
|
let mut iommu_str: &str = "";
|
||||||
|
let mut id_str: &str = "";
|
||||||
|
|
||||||
for param in params_list.iter() {
|
for param in params_list.iter() {
|
||||||
if param.starts_with("path=") {
|
if param.starts_with("path=") {
|
||||||
path_str = ¶m[5..];
|
path_str = ¶m[5..];
|
||||||
} else if param.starts_with("iommu=") {
|
} else if param.starts_with("iommu=") {
|
||||||
iommu_str = ¶m[6..];
|
iommu_str = ¶m[6..];
|
||||||
|
} else if param.starts_with("id=") {
|
||||||
|
id_str = ¶m[3..];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let id = if !id_str.is_empty() {
|
||||||
|
Some(String::from(id_str))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
Ok(DeviceConfig {
|
Ok(DeviceConfig {
|
||||||
path: PathBuf::from(path_str),
|
path: PathBuf::from(path_str),
|
||||||
iommu: parse_on_off(iommu_str)?,
|
iommu: parse_on_off(iommu_str)?,
|
||||||
id: None,
|
id,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -252,6 +252,9 @@ pub enum DeviceManagerError {
|
|||||||
/// Could not give the PCI device ID back.
|
/// Could not give the PCI device ID back.
|
||||||
#[cfg(feature = "pci_support")]
|
#[cfg(feature = "pci_support")]
|
||||||
PutPciDeviceId(pci::PciRootError),
|
PutPciDeviceId(pci::PciRootError),
|
||||||
|
|
||||||
|
/// Incorrect device ID as it is already used by another device.
|
||||||
|
DeviceIdAlreadyInUse,
|
||||||
}
|
}
|
||||||
pub type DeviceManagerResult<T> = result::Result<T, DeviceManagerError>;
|
pub type DeviceManagerResult<T> = result::Result<T, DeviceManagerError>;
|
||||||
|
|
||||||
@ -1554,8 +1557,17 @@ impl DeviceManager {
|
|||||||
)
|
)
|
||||||
.map_err(DeviceManagerError::AddPciDevice)?;
|
.map_err(DeviceManagerError::AddPciDevice)?;
|
||||||
|
|
||||||
let vfio_name = self.next_device_name(VFIO_DEVICE_NAME_PREFIX)?;
|
let vfio_name = if let Some(id) = &device_cfg.id {
|
||||||
device_cfg.id = Some(vfio_name.clone());
|
if self.pci_id_list.contains_key(id) {
|
||||||
|
return Err(DeviceManagerError::DeviceIdAlreadyInUse);
|
||||||
|
}
|
||||||
|
|
||||||
|
id.clone()
|
||||||
|
} else {
|
||||||
|
let id = self.next_device_name(VFIO_DEVICE_NAME_PREFIX)?;
|
||||||
|
device_cfg.id = Some(id.clone());
|
||||||
|
id
|
||||||
|
};
|
||||||
self.pci_id_list.insert(vfio_name, pci_device_bdf);
|
self.pci_id_list.insert(vfio_name, pci_device_bdf);
|
||||||
|
|
||||||
Ok(pci_device_bdf)
|
Ok(pci_device_bdf)
|
||||||
|
Loading…
Reference in New Issue
Block a user