libsel4vm: Remove allocman dependency

allocman is an object allocation manager that provides an implementation
of the `vka_t` interface. As libsel4vm can perform all allocation
through the `vka_t` interface, it doesn't need to know about allocman.
This commit also adds some missing #includes for dependencies that were
being originally included through the allocman header.

libsel4vm/CMakeLists.txt

diff --git a/libsel4vm/CMakeLists.txt b/libsel4vm/CMakeLists.txt
index f4ddfcb..427c2aa 100644
--- a/libsel4vm/CMakeLists.txt
+++ b/libsel4vm/CMakeLists.txt
@@ -77,7 +77,6 @@
     sel4utils
     sel4vka
     sel4vspace
-    sel4allocman
     sel4dma
     platsupport
     sel4_autoconf

libsel4vm/include/sel4vm/boot.h

diff --git a/libsel4vm/include/sel4vm/boot.h b/libsel4vm/include/sel4vm/boot.h
index d4e8ffe..7fd4e31 100644
--- a/libsel4vm/include/sel4vm/boot.h
+++ b/libsel4vm/include/sel4vm/boot.h
@@ -22,7 +22,7 @@
 #define BOOT_VCPU 0
 
 /* Initialise/Create VM */
-int vm_init(vm_t *vm, vka_t *vka, simple_t *host_simple, allocman_t *allocman, vspace_t host_vspace,
+int vm_init(vm_t *vm, vka_t *vka, simple_t *host_simple, vspace_t host_vspace,
             ps_io_ops_t *io_ops, seL4_CPtr host_endpoint, const char *name);
 
 /* Create a VCPU for a given VM */

libsel4vm/include/sel4vm/guest_vm.h

diff --git a/libsel4vm/include/sel4vm/guest_vm.h b/libsel4vm/include/sel4vm/guest_vm.h
index f081737..ca0a281 100644
--- a/libsel4vm/include/sel4vm/guest_vm.h
+++ b/libsel4vm/include/sel4vm/guest_vm.h
@@ -17,7 +17,7 @@
 #include <vka/vka.h>
 #include <simple/simple.h>
 #include <vspace/vspace.h>
-#include <allocman/allocman.h>
+#include <platsupport/io.h>
 
 #include <sel4vm/arch/guest_vm_arch.h>
 #include <sel4vm/guest_memory.h>
@@ -118,7 +118,6 @@
     vka_t *vka;
     ps_io_ops_t *io_ops;
     simple_t *simple;
-    allocman_t *allocman;
     /* Debugging & Identification */
     char *vm_name;
     unsigned int vm_id;

libsel4vm/src/boot.c

diff --git a/libsel4vm/src/boot.c b/libsel4vm/src/boot.c
index cf464c5..8464834 100644
--- a/libsel4vm/src/boot.c
+++ b/libsel4vm/src/boot.c
@@ -26,7 +26,7 @@
 
 static int curr_vcpu_index = 0;
 
-int vm_init(vm_t *vm, vka_t *vka, simple_t *host_simple, allocman_t *allocman, vspace_t host_vspace,
+int vm_init(vm_t *vm, vka_t *vka, simple_t *host_simple, vspace_t host_vspace,
             ps_io_ops_t *io_ops, seL4_CPtr host_endpoint, const char *name)
 {
     int err;
@@ -34,7 +34,6 @@
     /* Initialise vm fields */
     vm->vka = vka;
     vm->simple = host_simple;
-    vm->allocman = allocman;
     vm->io_ops = io_ops;
     vm->mem.vmm_vspace = host_vspace;
     vm->host_endpoint = host_endpoint;

libsel4vmmplatsupport/src/arch/arm/guest_image.c

diff --git a/libsel4vmmplatsupport/src/arch/arm/guest_image.c b/libsel4vmmplatsupport/src/arch/arm/guest_image.c
index de74792..3ee8d0e 100644
--- a/libsel4vmmplatsupport/src/arch/arm/guest_image.c
+++ b/libsel4vmmplatsupport/src/arch/arm/guest_image.c
@@ -19,6 +19,7 @@
 #include <elf/elf.h>
 #include <vka/capops.h>
 #include <cpio/cpio.h>
+#include <sel4utils/sel4_zf_logif.h>
 
 #include <sel4vm/guest_vm.h>
 #include <sel4vm/guest_memory.h>