tools: config-create: Place hypervisor and inmates at default addresses

If no location is specified and no memmap is found, use the default
address 0x3b000000 for the hypervisor and inmates region. This reduces
the need for adapting the included cell demo configs.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/tools/jailhouse-config-create b/tools/jailhouse-config-create
index 7aedd5c5427298b74d95635028063159cae653b1..7fc8671fd548488334fae117f21dbe0f86b4cfaa 100755 (executable)
--- a/tools/jailhouse-config-create
+++ b/tools/jailhouse-config-create
@@ -446,7 +446,22 @@ def parse_cmdline():
 
 
 def alloc_mem(regions, size):
-    mem = [0, size]
+    mem = [0x3b000000, size]
+    for r in regions:
+        if (
+            r.typestr == 'System RAM' and
+            r.start <= mem[0] and
+            r.stop + 1 >= mem[0] + mem[1]
+           ):
+            if r.start < mem[0]:
+                head_r = MemRegion(r.start, mem[0] - 1, r.typestr, r.comments)
+                regions.insert(regions.index(r), head_r)
+            if r.stop + 1 > mem[0] + mem[1]:
+                tail_r = MemRegion(mem[0] + mem[1], r.stop, r.typestr,
+                                   r.comments)
+                regions.insert(regions.index(r), tail_r)
+            regions.remove(r)
+            return mem
     for r in reversed(regions):
         if (r.typestr == 'System RAM' and r.size() >= mem[1]):
             mem[0] = r.start