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

vmm: Refactor MCFG table creation to take just the PCI segments

Browse Source 
This matches the lock taking behaviour of other functions in this file.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-10-29 10:44:51 +01:00
parent afe95e5a2a
commit 9d1a7e43a7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmm/src/acpi.rs
View File

@ -5,6 +5,7 @@
use crate::cpu::CpuManager; use crate::cpu::CpuManager;
use crate::device_manager::DeviceManager; use crate::device_manager::DeviceManager;
use crate::memory_manager::MemoryManager; use crate::memory_manager::MemoryManager;
use crate::pci_segment::PciSegment;
use crate::{GuestMemoryMmap, GuestRegionMmap}; use crate::{GuestMemoryMmap, GuestRegionMmap};
use acpi_tables::sdt::GenericAddress; use acpi_tables::sdt::GenericAddress;
use acpi_tables::{aml::Aml, rsdp::Rsdp, sdt::Sdt}; use acpi_tables::{aml::Aml, rsdp::Rsdp, sdt::Sdt};
@ -223,13 +224,13 @@ fn create_facp_table(dsdt_offset: GuestAddress) -> Sdt {
facp facp
} }
fn create_mcfg_table(device_manager: &Arc<Mutex<DeviceManager>>) -> Sdt { fn create_mcfg_table(pci_segments: &[PciSegment]) -> Sdt {
let mut mcfg = Sdt::new(*b"MCFG", 36, 1, *b"CLOUDH", *b"CHMCFG ", 1); let mut mcfg = Sdt::new(*b"MCFG", 36, 1, *b"CLOUDH", *b"CHMCFG ", 1);
// MCFG reserved 8 bytes // MCFG reserved 8 bytes
mcfg.append(0u64); mcfg.append(0u64);
for segment in device_manager.lock().unwrap().pci_segments() { for segment in pci_segments {
// 32-bit PCI enhanced configuration mechanism // 32-bit PCI enhanced configuration mechanism
mcfg.append(PciRangeEntry { mcfg.append(PciRangeEntry {
base_address: segment.mmio_config_address, base_address: segment.mmio_config_address,
@ -539,7 +540,7 @@ pub fn create_acpi_tables(
} }
// MCFG // MCFG
let mcfg = create_mcfg_table(device_manager); let mcfg = create_mcfg_table(device_manager.lock().unwrap().pci_segments());
let mcfg_offset = prev_tbl_off.checked_add(prev_tbl_len).unwrap(); let mcfg_offset = prev_tbl_off.checked_add(prev_tbl_len).unwrap();
guest_mem guest_mem
.write_slice(mcfg.as_slice(), mcfg_offset) .write_slice(mcfg.as_slice(), mcfg_offset)