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

vmm: vm: Carry information from hotplugged PCI device

Browse Source 
Pass from the device manager to the calling code the information about
the PCI device that has just been hotplugged.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-06-11 17:27:46 +02:00 committed by Rob Bradford
parent f08e9b6a73
commit 3316348d4c
1 changed files with 181 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
vmm/src/vm.rs
View File

@ -32,7 +32,9 @@ use crate::cpu;
use crate::device_manager::{self, get_win_size, Console, DeviceManager, DeviceManagerError}; use crate::device_manager::{self, get_win_size, Console, DeviceManager, DeviceManagerError};
use crate::memory_manager::{Error as MemoryManagerError, MemoryManager}; use crate::memory_manager::{Error as MemoryManagerError, MemoryManager};
use crate::migration::{url_to_path, vm_config_from_snapshot, VM_SNAPSHOT_FILE}; use crate::migration::{url_to_path, vm_config_from_snapshot, VM_SNAPSHOT_FILE};
use crate::{CPU_MANAGER_SNAPSHOT_ID, DEVICE_MANAGER_SNAPSHOT_ID, MEMORY_MANAGER_SNAPSHOT_ID}; use crate::{
PciDeviceInfo, CPU_MANAGER_SNAPSHOT_ID, DEVICE_MANAGER_SNAPSHOT_ID, MEMORY_MANAGER_SNAPSHOT_ID,
};
use anyhow::anyhow; use anyhow::anyhow;
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
use arch::BootProtocol; use arch::BootProtocol;
@ -758,11 +760,15 @@ impl Vm {
Ok(()) Ok(())
} }
pub fn add_device(&mut self, mut _device_cfg: DeviceConfig) -> Result<()> { #[cfg(not(feature = "pci_support"))]
if cfg!(feature = "pci_support") { pub fn add_device(&mut self, mut _device_cfg: DeviceConfig) -> Result<PciDeviceInfo> {
Err(Error::NoPciSupport)
}
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
{ pub fn add_device(&mut self, mut _device_cfg: DeviceConfig) -> Result<PciDeviceInfo> {
self.device_manager let pci_device_info = self
.device_manager
.lock() .lock()
.unwrap() .unwrap()
.add_device(&mut _device_cfg) .add_device(&mut _device_cfg)
@ -784,11 +790,8 @@ impl Vm {
.unwrap() .unwrap()
.notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED) .notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED)
.map_err(Error::DeviceManager)?; .map_err(Error::DeviceManager)?;
}
Ok(()) Ok(pci_device_info)
} else {
Err(Error::NoPciSupport)
}
} }
pub fn remove_device(&mut self, _id: String) -> Result<()> { pub fn remove_device(&mut self, _id: String) -> Result<()> {
@ -846,11 +849,15 @@ impl Vm {
} }
} }
pub fn add_disk(&mut self, mut _disk_cfg: DiskConfig) -> Result<()> { #[cfg(not(feature = "pci_support"))]
if cfg!(feature = "pci_support") { pub fn add_disk(&mut self, mut _disk_cfg: DiskConfig) -> Result<PciDeviceInfo> {
Err(Error::NoPciSupport)
}
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
{ pub fn add_disk(&mut self, mut _disk_cfg: DiskConfig) -> Result<PciDeviceInfo> {
self.device_manager let pci_device_info = self
.device_manager
.lock() .lock()
.unwrap() .unwrap()
.add_disk(&mut _disk_cfg) .add_disk(&mut _disk_cfg)
@ -872,18 +879,19 @@ impl Vm {
.unwrap() .unwrap()
.notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED) .notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED)
.map_err(Error::DeviceManager)?; .map_err(Error::DeviceManager)?;
}
Ok(()) Ok(pci_device_info)
} else { }
Err(Error::NoPciSupport)
} #[cfg(not(feature = "pci_support"))]
pub fn add_fs(&mut self, mut _fs_cfg: FsConfig) -> Result<PciDeviceInfo> {
Err(Error::NoPciSupport)
} }
pub fn add_fs(&mut self, mut _fs_cfg: FsConfig) -> Result<()> {
if cfg!(feature = "pci_support") {
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
{ pub fn add_fs(&mut self, mut _fs_cfg: FsConfig) -> Result<PciDeviceInfo> {
self.device_manager let pci_device_info = self
.device_manager
.lock() .lock()
.unwrap() .unwrap()
.add_fs(&mut _fs_cfg) .add_fs(&mut _fs_cfg)
@ -905,18 +913,19 @@ impl Vm {
.unwrap() .unwrap()
.notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED) .notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED)
.map_err(Error::DeviceManager)?; .map_err(Error::DeviceManager)?;
}
Ok(()) Ok(pci_device_info)
} else { }
Err(Error::NoPciSupport)
} #[cfg(not(feature = "pci_support"))]
pub fn add_pmem(&mut self, mut _pmem_cfg: PmemConfig) -> Result<PciDeviceInfo> {
Err(Error::NoPciSupport)
} }
pub fn add_pmem(&mut self, mut _pmem_cfg: PmemConfig) -> Result<()> {
if cfg!(feature = "pci_support") {
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
{ pub fn add_pmem(&mut self, mut _pmem_cfg: PmemConfig) -> Result<PciDeviceInfo> {
self.device_manager let pci_device_info = self
.device_manager
.lock() .lock()
.unwrap() .unwrap()
.add_pmem(&mut _pmem_cfg) .add_pmem(&mut _pmem_cfg)
@ -938,18 +947,19 @@ impl Vm {
.unwrap() .unwrap()
.notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED) .notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED)
.map_err(Error::DeviceManager)?; .map_err(Error::DeviceManager)?;
}
Ok(()) Ok(pci_device_info)
} else { }
Err(Error::NoPciSupport)
} #[cfg(not(feature = "pci_support"))]
pub fn add_net(&mut self, mut _net_cfg: NetConfig) -> Result<PciDeviceInfo> {
Err(Error::NoPciSupport)
} }
pub fn add_net(&mut self, mut _net_cfg: NetConfig) -> Result<()> {
if cfg!(feature = "pci_support") {
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
{ pub fn add_net(&mut self, mut _net_cfg: NetConfig) -> Result<PciDeviceInfo> {
self.device_manager let pci_device_info = self
.device_manager
.lock() .lock()
.unwrap() .unwrap()
.add_net(&mut _net_cfg) .add_net(&mut _net_cfg)
@ -971,22 +981,23 @@ impl Vm {
.unwrap() .unwrap()
.notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED) .notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED)
.map_err(Error::DeviceManager)?; .map_err(Error::DeviceManager)?;
}
Ok(()) Ok(pci_device_info)
} else { }
Err(Error::NoPciSupport)
} #[cfg(not(feature = "pci_support"))]
pub fn add_vsock(&mut self, mut _vsock_cfg: VsockConfig) -> Result<PciDeviceInfo> {
Err(Error::NoPciSupport)
} }
pub fn add_vsock(&mut self, mut _vsock_cfg: VsockConfig) -> Result<()> {
if cfg!(feature = "pci_support") {
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
{ pub fn add_vsock(&mut self, mut _vsock_cfg: VsockConfig) -> Result<PciDeviceInfo> {
if self.config.lock().unwrap().vsock.is_some() { if self.config.lock().unwrap().vsock.is_some() {
return Err(Error::TooManyVsockDevices); return Err(Error::TooManyVsockDevices);
} }
self.device_manager let pci_device_info = self
.device_manager
.lock() .lock()
.unwrap() .unwrap()
.add_vsock(&mut _vsock_cfg) .add_vsock(&mut _vsock_cfg)
@ -1004,11 +1015,8 @@ impl Vm {
.unwrap() .unwrap()
.notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED) .notify_hotplug(HotPlugNotificationFlags::PCI_DEVICES_CHANGED)
.map_err(Error::DeviceManager)?; .map_err(Error::DeviceManager)?;
}
Ok(()) Ok(pci_device_info)
} else {
Err(Error::NoPciSupport)
}
} }
fn os_signal_handler(signals: Signals, console_input_clone: Arc<Console>, on_tty: bool) { fn os_signal_handler(signals: Signals, console_input_clone: Arc<Console>, on_tty: bool) {