[vmbase] Update return type of layout functions to VirtualAddress
Test: atest vmbase_example.integration_test rialto_test
Test: m pvmfw_img
Change-Id: If33b0cc0bfffbe408908c382d0c077c92f3c197b
diff --git a/pvmfw/src/memory.rs b/pvmfw/src/memory.rs
index 5930ec9..27ab719 100644
--- a/pvmfw/src/memory.rs
+++ b/pvmfw/src/memory.rs
@@ -30,7 +30,7 @@
/// Returns memory range reserved for the appended payload.
pub fn appended_payload_range() -> Range<VirtualAddress> {
- let start = align_up(layout::binary_end(), SIZE_4KB).unwrap();
+ let start = align_up(layout::binary_end().0, SIZE_4KB).unwrap();
// pvmfw is contained in a 2MiB region so the payload can't be larger than the 2MiB alignment.
let end = align_up(start, SIZE_2MB).unwrap();
VirtualAddress(start)..VirtualAddress(end)