From 3f866b95f7b1dd8957bb1e1be7892b14bcd709d8 Mon Sep 17 00:00:00 2001
From: Axel Heider <axel.heider@hensoldt.net>
Date: Thu, 9 Mar 2023 16:08:52 +0100
Subject: [PATCH] vm_arm: inline memory initializtion module

Signed-off-by: Axel Heider <axel.heider@hensoldt.net>
---
 arm_vm_helpers.cmake                     |  1 -
 components/VM_Arm/src/main.c             |  4 ++++
 components/VM_Arm/src/modules/init_ram.c | 21 ---------------------
 3 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 components/VM_Arm/src/modules/init_ram.c

diff --git a/arm_vm_helpers.cmake b/arm_vm_helpers.cmake
index 78f28bbc..c2ab3c19 100644
--- a/arm_vm_helpers.cmake
+++ b/arm_vm_helpers.cmake
@@ -49,7 +49,6 @@ function(DeclareCAmkESARMVM init_component)
     )
 
     list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/map_frame_hack.c)
-    list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/init_ram.c)
 
     if(VmVirtUart)
         list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/vuart_init.c)
diff --git a/components/VM_Arm/src/main.c b/components/VM_Arm/src/main.c
index 58669ac8..12b97300 100644
--- a/components/VM_Arm/src/main.c
+++ b/components/VM_Arm/src/main.c
@@ -1175,6 +1175,10 @@ int main_continued(void)
         return -1;
     }
 
+    /* Install and initialize guest memory. */
+    err = vm_ram_register_at(&vm, ram_base, ram_size, vm.mem.map_one_to_one);
+    assert(!err);
+
     /* Load system images */
     err = load_vm(&vm, _kernel_name, _dtb_name, _initrd_name);
     if (err) {
diff --git a/components/VM_Arm/src/modules/init_ram.c b/components/VM_Arm/src/modules/init_ram.c
deleted file mode 100644
index 600e2fc0..00000000
--- a/components/VM_Arm/src/modules/init_ram.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2020, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#include <camkes.h>
-#include <sel4vm/guest_vm.h>
-#include <sel4vm/guest_memory.h>
-#include <sel4vm/guest_memory_helpers.h>
-#include <sel4vm/guest_ram.h>
-#include <sel4vmmplatsupport/guest_memory_util.h>
-#include <vmlinux.h>
-
-void WEAK init_ram_module(vm_t *vm, void *cookie)
-{
-    int err = vm_ram_register_at(vm, ram_base, ram_size, vm->mem.map_one_to_one);
-    assert(!err);
-}
-
-DEFINE_MODULE(init_ram, NULL, init_ram_module)