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

vmm: vm: Remove device from configuration after unplug

Browse Source 
This ensures that a device that is removed will not reappear after a
reboot.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-04-15 18:18:53 +01:00 committed by Samuel Ortiz
parent 444e5c2a04
commit f9a0445c3d
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vmm/src/vm.rs
View File

@ -710,14 +710,25 @@ impl Vm {
// ensure the device would not be created in case of a reboot. // ensure the device would not be created in case of a reboot.
{ {
let mut config = self.config.lock().unwrap(); let mut config = self.config.lock().unwrap();
// Remove if VFIO device
if let Some(devices) = config.devices.as_mut() { if let Some(devices) = config.devices.as_mut() {
devices.retain(|dev| { devices.retain(|dev| dev.id.as_ref() != Some(&_id));
if let Some(dev_id) = &dev.id {
*dev_id != _id
} else {
true
} }
});
// Remove if disk device
if let Some(disks) = config.disks.as_mut() {
disks.retain(|dev| dev.id.as_ref() != Some(&_id));
}
// Remove if net device
if let Some(net) = config.net.as_mut() {
net.retain(|dev| dev.id.as_ref() != Some(&_id));
}
// Remove if pmem device
if let Some(pmem) = config.pmem.as_mut() {
pmem.retain(|dev| dev.id.as_ref() != Some(&_id));
} }
} }