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

arch: vmm: Move ACPI tables creation to vmm crate

Browse Source 
Remove ACPI table creation from arch crate to the vmm crate simplifying
arch::configure_system()

GuestAddress(0) is used to mean no RSDP table rather than adding
complexity with a conditional argument or an Option type as it will
evaluate to a zero value which would be the default anyway.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2019-11-06 17:20:55 +00:00
parent c3eaa41b77
commit 0319a4a09a
7 changed files with 43 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/vm.rs
+31 -8
View File
@@ -23,7 +23,7 @@ extern crate vm_allocator;
extern crate vm_memory;
extern crate vm_virtio;
use crate::config::{ConsoleOutputMode, VmConfig};
use crate::config::VmConfig;
use crate::device_manager::{get_win_size, Console, DeviceManager, DeviceManagerError};
use arch::RegionType;
use devices::ioapic;
@@ -768,7 +768,34 @@ impl Vm {
)
.map_err(|_| Error::CmdLine)?;
let vcpu_count = self.config.cpus.cpu_count;
let end_of_range = GuestAddress((1 << get_host_cpu_phys_bits()) - 1);
#[allow(unused_mut, unused_assignments)]
let mut rsdp_addr: Option<GuestAddress> = None;
#[cfg(feature = "acpi")]
{
rsdp_addr = Some({
let end_of_range = GuestAddress((1 << get_host_cpu_phys_bits()) - 1);
let mem_end = mem.end_addr();
let start_of_device_area = if mem_end < arch::layout::MEM_32BIT_RESERVED_START {
arch::layout::RAM_64BIT_START
} else {
mem_end.unchecked_add(1)
};
use crate::config::ConsoleOutputMode;
crate::acpi::create_acpi_tables(
&mem,
vcpu_count,
self.config.serial.mode != ConsoleOutputMode::Off,
start_of_device_area,
end_of_range,
self.devices.virt_iommu(),
)
});
}
match entry_addr.setup_header {
Some(hdr) => {
arch::configure_system(
@@ -777,9 +804,7 @@ impl Vm {
cmdline_cstring.to_bytes().len() + 1,
vcpu_count,
Some(hdr),
self.config.serial.mode != ConsoleOutputMode::Off,
end_of_range,
self.devices.virt_iommu(),
rsdp_addr,
)
.map_err(|_| Error::CmdLine)?;
@@ -798,9 +823,7 @@ impl Vm {
cmdline_cstring.to_bytes().len() + 1,
vcpu_count,
None,
self.config.serial.mode != ConsoleOutputMode::Off,
end_of_range,
self.devices.virt_iommu(),
rsdp_addr,
)
.map_err(|_| Error::CmdLine)?;