External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 02:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Update VmConfig when adding new device

Browse Source 
Ensures the configuration is updated after a new device has been
hotplugged. In the event of a reboot, this means the new VM will be
started with the new device that had been previously hotplugged.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-02-28 15:46:50 +01:00 committed by Rob Bradford
parent a86f4369a7
commit c1af13efeb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmm/src/device_manager.rs
View File

@ -1648,7 +1648,7 @@ impl DeviceManager {
}
#[cfg(feature = "pci_support")]
pub fn add_device(&mut self, path: String) -> DeviceManagerResult<()> {
pub fn add_device(&mut self, path: String) -> DeviceManagerResult<DeviceConfig> {
let device_cfg = DeviceConfig {
path: PathBuf::from(path),
iommu: false,
@ -1680,7 +1680,7 @@ impl DeviceManager {
// Update the PCIU bitmap
self.pci_devices_up |= 1 << (device_id >> 3);
Ok(())
Ok(device_cfg)
}
}

15
vmm/src/vm.rs
View File

@ -547,19 +547,30 @@ impl Vm {
if cfg!(feature = "pci_support") {
#[cfg(feature = "pci_support")]
{
self.devices
let device_cfg = self
.devices
.lock()
.unwrap()
.add_device(_path)
.map_err(Error::DeviceManager)?;
// Update VmConfig by adding the new device. This is important to
// ensure the device would be created in case of a reboot.
{
let mut config = self.config.lock().unwrap();
if let Some(devices) = config.devices.as_mut() {
devices.push(device_cfg);
} else {
config.devices = Some(vec![device_cfg]);
}
}
self.devices
.lock()
.unwrap()
.notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED)
.map_err(Error::DeviceManager)?;
}
Ok(())
} else {
Err(Error::NoPciSupport)