External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-06-30 23:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

aarch64: Change RAM_START type GuestAddress

Browse Source 
Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao 2022-03-30 11:52:10 +08:00 committed by Xin Wang
parent ef9f37cd5f
commit a3dbc3b415
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/src/aarch64/fdt.rs
View File

@ -255,10 +255,10 @@ fn create_memory_node(
}
}
} else {
let mem_size = guest_mem.last_addr().raw_value() - super::layout::RAM_START + 1;
let mem_size = guest_mem.last_addr().raw_value() - super::layout::RAM_START.raw_value() + 1;
// See https://github.com/torvalds/linux/blob/master/Documentation/devicetree/booting-without-of.txt#L960
// for an explanation of this.
let mem_reg_prop = [super::layout::RAM_START as u64, mem_size as u64];
let mem_reg_prop = [super::layout::RAM_START.raw_value() as u64, mem_size as u64];
let memory_node = fdt.begin_node("memory")?;
fdt.property_string("device_type", "memory")?;

6
arch/src/aarch64/layout.rs
View File

@ -86,7 +86,7 @@ pub const PCI_MMCONFIG_SIZE: u64 = 256 << 20;
pub const PCI_MMIO_CONFIG_SIZE_PER_SEGMENT: u64 = 4096 * 256;
/// Start of RAM.
pub const RAM_START: u64 = 0x4000_0000;
pub const RAM_START: GuestAddress = GuestAddress(0x4000_0000);
/// Kernel command line maximum size.
/// As per `arch/arm64/include/uapi/asm/setup.h`.
@ -94,11 +94,11 @@ pub const CMDLINE_MAX_SIZE: usize = 2048;
/// FDT is at the beginning of RAM.
/// Maximum size of the device tree blob as specified in https://www.kernel.org/doc/Documentation/arm64/booting.txt.
pub const FDT_START: u64 = RAM_START;
pub const FDT_START: u64 = RAM_START.0;
pub const FDT_MAX_SIZE: usize = 0x20_0000;
/// Put ACPI table above dtb
pub const ACPI_START: u64 = RAM_START + FDT_MAX_SIZE as u64;
pub const ACPI_START: u64 = RAM_START.0 + FDT_MAX_SIZE as u64;
pub const ACPI_MAX_SIZE: usize = 0x20_0000;
pub const RSDP_POINTER: GuestAddress = GuestAddress(ACPI_START);

4
arch/src/aarch64/mod.rs
View File

@ -108,7 +108,7 @@ pub fn arch_memory_regions(size: GuestUsize) -> Vec<(GuestAddress, usize, Region
),
// 1 GiB ~ : Ram
(
GuestAddress(layout::RAM_START),
layout::RAM_START,
(size - ram_deduction) as usize,
RegionType::Ram,
),
@ -212,7 +212,7 @@ mod tests {
fn test_arch_memory_regions_dram() {
let regions = arch_memory_regions((1usize << 32) as u64); //4GB
assert_eq!(5, regions.len());
assert_eq!(GuestAddress(layout::RAM_START), regions[4].0);
assert_eq!(layout::RAM_START, regions[4].0);
assert_eq!(((1 << 32) - layout::UEFI_SIZE) as usize, regions[4].1);
assert_eq!(RegionType::Ram, regions[4].2);
}

6
vmm/src/vm.rs
View File

@ -2986,16 +2986,12 @@ mod tests {
use arch::aarch64::gic::kvm::create_gic;
use arch::aarch64::layout;
use arch::{DeviceType, MmioDeviceInfo};
use vm_memory::GuestAddress;
const LEN: u64 = 4096;
#[test]
fn test_create_fdt_with_devices() {
let regions = vec![(
GuestAddress(layout::RAM_START),
(layout::FDT_MAX_SIZE + 0x1000) as usize,
)];
let regions = vec![(layout::RAM_START, (layout::FDT_MAX_SIZE + 0x1000) as usize)];
let mem = GuestMemoryMmap::from_ranges(&regions).expect("Cannot initialize memory");
let dev_info: HashMap<(DeviceType, std::string::String), MmioDeviceInfo> = [