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

vmm: device_manager: Make serial and ioapic devices migratable

Browse Source 
Serial and Ioapic both implement the Migratable trait, hence the
DeviceManager can store them in the list of Migratable devices.

Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
This commit is contained in:
Yi Sun 2019-05-13 01:38:24 +08:00 committed by Sebastien Boeuf
parent 12b036a824
commit 93d3abfd6e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vmm/src/device_manager.rs
View File

@ -591,6 +591,7 @@ impl DeviceManager {
let ioapic = let ioapic =
DeviceManager::add_ioapic(&address_manager, Arc::clone(&msi_interrupt_manager))?; DeviceManager::add_ioapic(&address_manager, Arc::clone(&msi_interrupt_manager))?;
let ioapic_migratable = Arc::clone(&ioapic) as Arc<Mutex<dyn Migratable>>;
bus_devices.push(Arc::clone(&ioapic) as Arc<Mutex<dyn BusDevice>>); bus_devices.push(Arc::clone(&ioapic) as Arc<Mutex<dyn BusDevice>>);
// Now we can create the legacy interrupt manager, which needs the freshly // Now we can create the legacy interrupt manager, which needs the freshly
@ -651,6 +652,8 @@ impl DeviceManager {
device_manager device_manager
.add_legacy_devices(reset_evt.try_clone().map_err(DeviceManagerError::EventFd)?)?; .add_legacy_devices(reset_evt.try_clone().map_err(DeviceManagerError::EventFd)?)?;
device_manager.add_migratable_device(ioapic_migratable);
#[cfg(feature = "acpi")] #[cfg(feature = "acpi")]
{ {
device_manager.ged_notification_device = device_manager.add_acpi_devices( device_manager.ged_notification_device = device_manager.add_acpi_devices(
@ -981,6 +984,8 @@ impl DeviceManager {
.insert(serial.clone(), 0x3f8, 0x8) .insert(serial.clone(), 0x3f8, 0x8)
.map_err(DeviceManagerError::BusError)?; .map_err(DeviceManagerError::BusError)?;
self.add_migratable_device(Arc::clone(&serial) as Arc<Mutex<dyn Migratable>>);
Some(serial) Some(serial)
} else { } else {
None None