inmates: Avoid jailhouse/types.h

Add missing bool to inmate_common.h and use inmate.h instead of pulling
the hypervisor types header.

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

diff --git a/inmates/lib/arm/printk.c b/inmates/lib/arm/printk.c
index 239731a589e531099cf4cc5d6638e13169c4fb6e..874dada3716b65cda5579788207f88c20c7c529f 100644 (file)
--- a/inmates/lib/arm/printk.c
+++ b/inmates/lib/arm/printk.c
@@ -10,10 +10,9 @@
  * the COPYING file in the top-level directory.
  */
 
-#include <jailhouse/types.h>
+#include <inmate.h>
 #include <asm/debug.h>
 #include <stdarg.h>
-#include <inmate.h>
 
 static struct uart_chip chip;
 

diff --git a/inmates/lib/inmate_common.h b/inmates/lib/inmate_common.h
index 89aa756b49c3fb0bf18ff9fe3c48be72f00bfbf6..30d0d396c132b3bb17720bf8d84288b85fea02e8 100644 (file)
--- a/inmates/lib/inmate_common.h
+++ b/inmates/lib/inmate_common.h
@@ -29,6 +29,8 @@ typedef u32 __u32;
 typedef s64 __s64;
 typedef u64 __u64;
 
+typedef enum { true = 1, false = 0 } bool;
+
 #include <jailhouse/hypercall.h>
 
 #define comm_region    ((struct jailhouse_comm_region *)COMM_REGION_BASE)

diff --git a/inmates/lib/x86/inmate.h b/inmates/lib/x86/inmate.h
index 8fb6451a11da93343b9ed378a9d62b023359f3ae..2c22de06d8753ad24dbdd029742cbefeaf9ac9a5 100644 (file)
--- a/inmates/lib/x86/inmate.h
+++ b/inmates/lib/x86/inmate.h
@@ -74,8 +74,6 @@ typedef unsigned int u32;
 typedef signed long long s64;
 typedef unsigned long long u64;
 
-typedef enum { true=1, false=0 } bool;
-
 static inline void cpu_relax(void)
 {
        asm volatile("rep; nop" : : : "memory");