commit | aa42e33a28fff2021f3de0d7242411dfaa66f29d | [log] [tgz] |
---|---|---|
author | Pierre-Clément Tosi <ptosi@google.com> | Tue Nov 26 23:38:45 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 26 23:38:45 2024 +0000 |
tree | 14ba36f0373e86c302df202bd335ea3a514f265e | |
parent | 6e2cfa10f81b7d8d913ff15cb20d9d23c4ea78a1 [diff] | |
parent | 9e2de30326ac8cd23799ec2fdba5be18c008a9fd [diff] |
vmbase_example: Use layout::crosvm for MMIO range am: 583f7da0e0 am: 9e2de30326 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3375617 Change-Id: Iae0414d0ed6327e1da3b7593d4e93d5704cb62b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/guest/vmbase_example/src/layout.rs b/guest/vmbase_example/src/layout.rs index 50ecb7e..55c7283 100644 --- a/guest/vmbase_example/src/layout.rs +++ b/guest/vmbase_example/src/layout.rs
@@ -19,8 +19,8 @@ use log::info; 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); +pub const DEVICE_REGION: MemoryRegion = + MemoryRegion::new(layout::crosvm::MMIO_START, layout::crosvm::MMIO_END); /// Writable data region for the stack. pub fn boot_stack_range() -> Range<VirtualAddress> {