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 f2455bd88f74ba9af0dbe7b091e52c10c0347129..6d3673684bb91e108e885033d254bf0c48fb0bb0 100644 (file)
--- 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 635544a1187a0736abd8323421d6cce6f92840ff..392459afc33829fea8c71846ecc50e2cc3f458c5 100644 (file)
--- 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 e0cab47612aeea486f2095239074a2493af9943b..6eaacc4707a86a635b6b705f864649739d6914da 100644 (file)
--- 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 e101b56412abd7fb42231e3b7adaaf704d64bc8a..cad7ea603500a952ccd86281cf80f70ad5a969d1 100644 (file)
--- 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 (file)
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 35c5b4423671fc4bb766039eee5bb8f76ccff028..725fd0441ea27b699ceea86bf4e15369c7714808 100644 (file)
--- 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 6da9d1472177512642f38fc67ba4fbee653acddc..1bc7236353d1fa688cd063c91a748426e8301b7f 100644 (file)
--- 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))