commit 63f4c9ef80f860d99c7a1474c4e35869bd7945d2
author Alice Wang <aliceywang@google.com> Mon Jun 12 09:36:43 2023 +0000
committer Alice Wang <aliceywang@google.com> Mon Jun 12 12:21:31 2023 +0000
tree 291f0bc7dc4d338e4be9806b50856314b97a4f19
parent 89d295964b5f6d6772cf815f346cafb1cd40013f

[vmbase] Move MAX_VIRT_ADDR from pvmfw to vmbase

As it is defined by the architecture specified in vmbase.

This parameter will be reused in both pvmfw and rialto.

Bug: 284462758
Test: m pvmfw_img
Change-Id: I1e638afeed223e443b400e2e65c2fcc9f79517e1

pvmfw/src/entry.rs

diff --git a/pvmfw/src/entry.rs b/pvmfw/src/entry.rs
index 5e22bae..96855f2 100644
--- a/pvmfw/src/entry.rs
+++ b/pvmfw/src/entry.rs
@@ -227,7 +227,7 @@
     // Up to this point, we were using the built-in static (from .rodata) page tables.
     MEMORY.lock().replace(MemoryTracker::new(
         page_table,
-        crosvm::MEM_START..memory::MAX_ADDR,
+        crosvm::MEM_START..layout::MAX_VIRT_ADDR,
         crosvm::MMIO_RANGE,
         Some(memory::appended_payload_range()),
     ));