| commit | 0ac63fecdffc2d714c8aeb0c5d426716c35a1598 | [log] [tgz] |
|---|---|---|
| author | Pierre-Clément Tosi <ptosi@google.com> | Tue Aug 13 20:27:31 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 13 20:27:31 2024 +0000 |
| tree | 2b6b9a89a09e73e14e1e7bb7012ecd8fa8356f75 | |
| parent | b0d94ba9fcc4ff18eda868ce7e4a6726c8f2b71d [diff] | |
| parent | fbbadb557f72192f591a8ecf4e0892cc2b4d1507 [diff] |
vmbase_example: Use vmbase::memory::PAGE_SIZE am: 26f7d14397 am: fbbadb557f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3217919 Change-Id: Iddee54c1138dfc181f6a73cac095285260c91ab4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/libvmbase/example/src/layout.rs b/libs/libvmbase/example/src/layout.rs index 49e4aa7..50ecb7e 100644 --- a/libs/libvmbase/example/src/layout.rs +++ b/libs/libvmbase/example/src/layout.rs
@@ -17,14 +17,13 @@ use aarch64_paging::paging::{MemoryRegion, VirtualAddress}; use core::ops::Range; use log::info; -use vmbase::layout; +use vmbase::{layout, memory::PAGE_SIZE}; /// The first 1 GiB of memory are used for MMIO. pub const DEVICE_REGION: MemoryRegion = MemoryRegion::new(0, 0x40000000); /// Writable data region for the stack. pub fn boot_stack_range() -> Range<VirtualAddress> { - const PAGE_SIZE: usize = 4 << 10; layout::stack_range(40 * PAGE_SIZE) }