commit fbbadb557f72192f591a8ecf4e0892cc2b4d1507
author Pierre-Clément Tosi <ptosi@google.com> Tue Aug 13 19:58:17 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 13 19:58:17 2024 +0000
tree e06ba112f5b60468f13e93b42894aaffcb74336e
parent 99107cecbe2234e13f163535662d29602775987c
parent 26f7d14397022f247d74a8f9accded1663dfa2e1

vmbase_example: Use vmbase::memory::PAGE_SIZE am: 26f7d14397

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3217919

Change-Id: Idf5b5e9a876cff3270265a2e55e072c705033b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/libvmbase/example/src/layout.rs

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)
 }