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: Add id option to VFIO hotplug

Browse Source 
Add a new id option to the VFIO hotplug command so that it matches the
VFIO coldplug semantic.

This is done by refactoring the existing code for VFIO hotplug, where
VmAddDeviceData structure is replaced by DeviceConfig. This structure is
the one used whenever a VFIO device is coldplugged, which is why it
makes sense to reuse it for the hotplug codepath.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2020-03-11 16:17:51 +01:00
parent 18dc916380
commit 34412c9b41
6 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vmm/src/vm.rs
View File

@@ -24,7 +24,7 @@ extern crate vm_allocator;
extern crate vm_memory;
extern crate vm_virtio;
use crate::config::VmConfig;
use crate::config::{DeviceConfig, VmConfig};
use crate::cpu;
use crate::device_manager::{get_win_size, Console, DeviceManager, DeviceManagerError};
use crate::memory_manager::{get_host_cpu_phys_bits, Error as MemoryManagerError, MemoryManager};
@@ -543,15 +543,14 @@ impl Vm {
Ok(())
}
pub fn add_device(&mut self, _path: String) -> Result<()> {
pub fn add_device(&mut self, mut _device_cfg: DeviceConfig) -> Result<()> {
if cfg!(feature = "pci_support") {
#[cfg(feature = "pci_support")]
{
let device_cfg = self
.device_manager
self.device_manager
.lock()
.unwrap()
.add_device(_path)
.add_device(&mut _device_cfg)
.map_err(Error::DeviceManager)?;
// Update VmConfig by adding the new device. This is important to
@@ -559,9 +558,9 @@ impl Vm {
{
let mut config = self.config.lock().unwrap();
if let Some(devices) = config.devices.as_mut() {
devices.push(device_cfg);
devices.push(_device_cfg);
} else {
config.devices = Some(vec![device_cfg]);
config.devices = Some(vec![_device_cfg]);
}
}