vmbase: Move heap.rs out of pvmfw
The module isn't pvmfw-specific so move it to vmbase and re-use the now
centralized implementation in Rialto and vmbase_example. This will allow
fully wrapping heap-initialization in vmbase in a future commit.
Deduplicate the dependency on buddy_system_allocator.
Test: TH
Change-Id: If39f46d99a3721001b5784f782577ae0c2a4b89d
diff --git a/pvmfw/src/entry.rs b/pvmfw/src/entry.rs
index 78383d2..56f9462 100644
--- a/pvmfw/src/entry.rs
+++ b/pvmfw/src/entry.rs
@@ -15,10 +15,8 @@
//! Low-level entry and exit points of pvmfw.
use crate::config;
-use crate::configure_global_allocator_size;
use crate::crypto;
use crate::fdt;
-use crate::heap;
use crate::memory;
use core::arch::asm;
use core::mem::{drop, size_of};
@@ -33,7 +31,7 @@
use log::LevelFilter;
use vmbase::util::RangeExt as _;
use vmbase::{
- console,
+ configure_global_allocator_size, console, heap,
layout::{self, crosvm},
logger, main,
memory::{min_dcache_line_size, MemoryTracker, MEMORY, SIZE_128KB, SIZE_4KB},