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:
Sebastien Boeuf
2020-03-11 11:23:42 +01:00
committed by Rob Bradford
parent f4a956a60a
commit 9023444ad3
4 changed files with 27 additions and 4 deletions

View File

@@ -252,6 +252,9 @@ pub enum DeviceManagerError {
/// Could not give the PCI device ID back.
#[cfg(feature = "pci_support")]
PutPciDeviceId(pci::PciRootError),
/// Incorrect device ID as it is already used by another device.
DeviceIdAlreadyInUse,
}
pub type DeviceManagerResult<T> = result::Result<T, DeviceManagerError>;
@@ -1554,8 +1557,17 @@ impl DeviceManager {
)
.map_err(DeviceManagerError::AddPciDevice)?;
let vfio_name = self.next_device_name(VFIO_DEVICE_NAME_PREFIX)?;
device_cfg.id = Some(vfio_name.clone());
let vfio_name = if let Some(id) = &device_cfg.id {
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);
Ok(pci_device_bdf)