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

vmm: device_manager: Always embed MemoryManager in the struct

Browse Source 
Currently the MemoryManager is only used on the ACPI code paths after
the DeviceManager has been created. This will change in a future commit
as part of the refactoring so for now always include it but name it with
underscore prefix to indicate it might not always be used.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-01-29 15:17:00 +00:00
parent 789a39a2d5
commit 68fa97eb0e
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vmm/src/device_manager.rs
View File

@ -396,15 +396,14 @@ pub struct DeviceManager {
migratable_devices: Vec<Arc<Mutex<dyn Migratable>>>,
// Memory Manager
#[cfg(feature = "acpi")]
memory_manager: Arc<Mutex<MemoryManager>>,
_memory_manager: Arc<Mutex<MemoryManager>>,
}
impl DeviceManager {
pub fn new(
vm_info: &VmInfo,
allocator: Arc<Mutex<SystemAllocator>>,
memory_manager: Arc<Mutex<MemoryManager>>,
_memory_manager: Arc<Mutex<MemoryManager>>,
_exit_evt: &EventFd,
reset_evt: &EventFd,
) -> DeviceManagerResult<Self> {
@ -477,7 +476,7 @@ impl DeviceManager {
virtio_devices.append(&mut DeviceManager::make_virtio_devices(
vm_info,
&address_manager,
&memory_manager,
&_memory_manager,
&mut _mmap_regions,
&mut migratable_devices,
)?);
@ -519,8 +518,6 @@ impl DeviceManager {
#[cfg(feature = "acpi")]
let config = vm_info.vm_cfg.clone();
#[cfg(feature = "acpi")]
let memory_manager_clone = memory_manager.clone();
address_manager
.allocator
@ -531,7 +528,7 @@ impl DeviceManager {
address_manager
.io_bus
.insert(memory_manager, 0xa00, 0x18)
.insert(_memory_manager.clone(), 0xa00, 0x18)
.map_err(DeviceManagerError::BusError)?;
Ok(DeviceManager {
@ -545,8 +542,7 @@ impl DeviceManager {
#[cfg(feature = "acpi")]
config,
migratable_devices,
#[cfg(feature = "acpi")]
memory_manager: memory_manager_clone,
_memory_manager,
})
}
@ -1700,8 +1696,13 @@ fn create_ged_device(ged_irq: u32) -> Vec<u8> {
impl Aml for DeviceManager {
fn to_aml_bytes(&self) -> Vec<u8> {
let mut bytes = Vec::new();
let start_of_device_area = self.memory_manager.lock().unwrap().start_of_device_area().0;
let end_of_device_area = self.memory_manager.lock().unwrap().end_of_device_area().0;
let start_of_device_area = self
._memory_manager
.lock()
.unwrap()
.start_of_device_area()
.0;
let end_of_device_area = self._memory_manager.lock().unwrap().end_of_device_area().0;
let pci_dsdt_data = aml::Device::new(
"_SB_.PCI0".into(),
vec![