From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 11 May 2016 11:43:03 +0000 (+0100)
Subject: Introduce an architecture specific convenience header
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5659191e4732e1bd47d7932f88d617688bb5161c;p=xtf.git

Introduce an architecture specific convenience header

Avoid introducing arch/x86/lib.h implicitly via xtf/lib.h

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/arch/x86/hvm/traps.c b/arch/x86/hvm/traps.c
index f2455bd..6d36736 100644
--- a/arch/x86/hvm/traps.c
+++ b/arch/x86/hvm/traps.c
@@ -1,6 +1,7 @@
 #include <xtf/traps.h>
 #include <xtf/lib.h>
 
+#include <arch/x86/lib.h>
 #include <arch/x86/processor.h>
 #include <arch/x86/desc.h>
 
diff --git a/arch/x86/pv/traps.c b/arch/x86/pv/traps.c
index 635544a..392459a 100644
--- a/arch/x86/pv/traps.c
+++ b/arch/x86/pv/traps.c
@@ -2,6 +2,7 @@
 #include <xtf/lib.h>
 #include <xtf/hypercall.h>
 
+#include <arch/x86/lib.h>
 #include <arch/x86/processor.h>
 #include <arch/x86/segment.h>
 #include <arch/x86/mm.h>
diff --git a/arch/x86/setup.c b/arch/x86/setup.c
index e0cab47..6eaacc4 100644
--- a/arch/x86/setup.c
+++ b/arch/x86/setup.c
@@ -4,6 +4,7 @@
 #include <xtf/extable.h>
 
 #include <arch/x86/desc.h>
+#include <arch/x86/lib.h>
 #include <arch/x86/mm.h>
 #include <arch/x86/traps.h>
 
diff --git a/arch/x86/traps.c b/arch/x86/traps.c
index e101b56..cad7ea6 100644
--- a/arch/x86/traps.c
+++ b/arch/x86/traps.c
@@ -3,6 +3,7 @@
 #include <xtf/exlog.h>
 
 #include <arch/x86/decode.h>
+#include <arch/x86/lib.h>
 #include <arch/x86/processor.h>
 
 bool (*xtf_unhandled_exception_hook)(struct cpu_regs *regs);
diff --git a/include/arch/x86/xtf.h b/include/arch/x86/xtf.h
new file mode 100644
index 0000000..eb7f9dd
--- /dev/null
+++ b/include/arch/x86/xtf.h
@@ -0,0 +1,16 @@
+#ifndef XTF_X86_XTF_H
+#define XTF_X86_XTF_H
+
+#include <arch/x86/lib.h>
+
+#endif /* XTF_X86_XTF_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/include/xtf.h b/include/xtf.h
index 35c5b44..725fd04 100644
--- a/include/xtf.h
+++ b/include/xtf.h
@@ -24,6 +24,9 @@
 #include <xtf/hypercall.h>
 #include <xtf/traps.h>
 
+/* Arch specific headers. */
+#include <arch/x86/xtf.h>
+
 #endif /* XTF_H */
 
 /*
diff --git a/include/xtf/lib.h b/include/xtf/lib.h
index 6da9d14..1bc7236 100644
--- a/include/xtf/lib.h
+++ b/include/xtf/lib.h
@@ -2,8 +2,7 @@
 #define XTF_LIB_H
 
 #include <xtf/compiler.h>
-
-#include <arch/x86/lib.h>
+#include <xtf/types.h>
 
 #define ARRAY_SIZE(a)    (sizeof(a) / sizeof(*a))