commit 22d5eaa57060ebe34d3a76fa0c09c744d05114c4
author Wedson Almeida Filho <wedsonaf@google.com> Sun Dec 16 00:38:49 2018 +0000
committer Wedson Almeida Filho <wedsonaf@google.com> Mon Dec 17 15:46:02 2018 +0000
tree 23b6f53f85aeda0bb42f0a97891b15cb110bc303
parent 11a9b0bbb0f29e78b8fe74c9c86f8c2d6e31161b

Use explicit page pool in page table manipulation.

Change-Id: Ibc3c21f815dfae54a541581941e553f79caaaace

src/fdt_handler_test.cc

diff --git a/src/fdt_handler_test.cc b/src/fdt_handler_test.cc
index c544454..5477b4e 100644
--- a/src/fdt_handler_test.cc
+++ b/src/fdt_handler_test.cc
@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-extern "C" {
-#include "hf/fdt_handler.h"
+#include <gmock/gmock.h>
 
-#include "hf/alloc.h"
+extern "C" {
 #include "hf/boot_params.h"
+#include "hf/fdt_handler.h"
+#include "hf/mpool.h"
 }
 
 #include <memory>
 
-#include <gmock/gmock.h>
-
 namespace
 {
 using ::testing::Eq;
@@ -95,19 +94,22 @@
 
 TEST(fdt, find_memory_ranges)
 {
+	struct mpool ppool;
 	std::unique_ptr<uint8_t[]> test_heap(new uint8_t[TEST_HEAP_SIZE]);
-	halloc_init((size_t)test_heap.get(), TEST_HEAP_SIZE);
-	ASSERT_TRUE(mm_init());
+
+	mpool_init(&ppool, sizeof(struct mm_page_table));
+	mpool_add_chunk(&ppool, test_heap.get(), TEST_HEAP_SIZE);
+	ASSERT_TRUE(mm_init(&ppool));
 
 	struct fdt_header *fdt;
 	struct fdt_node n;
 	struct boot_params params = {};
 
-	fdt = fdt_map(pa_init((uintpaddr_t)&test_dtb), &n);
+	fdt = fdt_map(pa_init((uintpaddr_t)&test_dtb), &n, &ppool);
 	ASSERT_THAT(fdt, NotNull());
 	ASSERT_TRUE(fdt_find_child(&n, ""));
 	fdt_find_memory_ranges(&n, &params);
-	ASSERT_TRUE(fdt_unmap(fdt));
+	ASSERT_TRUE(fdt_unmap(fdt, &ppool));
 
 	EXPECT_THAT(params.mem_ranges_count, Eq(3));
 	EXPECT_THAT(pa_addr(params.mem_ranges[0].begin), Eq(0x00000000));