From 48f99701c3af50de31f626dbbf0e251d68c89559 Mon Sep 17 00:00:00 2001
From: Adrian Danis <Adrian.Danis@data61.csiro.au>
Date: Fri, 28 Oct 2016 12:16:41 +1100
Subject: [PATCH] libsel4: Move vt-x definitions into common x86

---
 libsel4/arch_include/x86/interfaces/sel4arch.xml       | 9 +++++++++
 libsel4/arch_include/x86/sel4/arch/types.h             | 4 ++++
 libsel4/sel4_arch_include/ia32/interfaces/sel4arch.xml | 9 ---------
 libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h  | 4 ----
 libsel4/tools/syscall_stub_gen.py                      | 6 ++++++
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/libsel4/arch_include/x86/interfaces/sel4arch.xml b/libsel4/arch_include/x86/interfaces/sel4arch.xml
index 531e3665c..d04477656 100644
--- a/libsel4/arch_include/x86/interfaces/sel4arch.xml
+++ b/libsel4/arch_include/x86/interfaces/sel4arch.xml
@@ -9,6 +9,15 @@
      @TAG(NICTA_BSD)
   -->
 <api>
+    <struct name="seL4_VCPUContext">
+        <member name="eax"/>
+        <member name="ebx"/>
+        <member name="ecx"/>
+        <member name="edx"/>
+        <member name="esi"/>
+        <member name="edi"/>
+        <member name="ebp"/>
+    </struct>
     <interface name="seL4_X86_PageDirectory">
         <method id="X86PageDirectoryMap" name="Map">
             <param dir="in" name="vroot" type="seL4_CPtr"/>
diff --git a/libsel4/arch_include/x86/sel4/arch/types.h b/libsel4/arch_include/x86/sel4/arch/types.h
index 8ac9b171d..516556a52 100644
--- a/libsel4/arch_include/x86/sel4/arch/types.h
+++ b/libsel4/arch_include/x86/sel4/arch/types.h
@@ -40,4 +40,8 @@ typedef enum {
     SEL4_FORCE_LONG_ENUM(seL4_X86_VMAttributes),
 } seL4_X86_VMAttributes;
 
+typedef struct seL4_VCPUContext_ {
+    seL4_Word eax, ebx, ecx, edx, esi, edi, ebp;
+} seL4_VCPUContext;
+
 #endif
diff --git a/libsel4/sel4_arch_include/ia32/interfaces/sel4arch.xml b/libsel4/sel4_arch_include/ia32/interfaces/sel4arch.xml
index 9dff8bd7f..371fa7cd4 100644
--- a/libsel4/sel4_arch_include/ia32/interfaces/sel4arch.xml
+++ b/libsel4/sel4_arch_include/ia32/interfaces/sel4arch.xml
@@ -24,13 +24,4 @@
         <member name="fs"/>
         <member name="gs"/>
     </struct>
-    <struct name="seL4_VCPUContext">
-        <member name="eax"/>
-        <member name="ebx"/>
-        <member name="ecx"/>
-        <member name="edx"/>
-        <member name="esi"/>
-        <member name="edi"/>
-        <member name="ebp"/>
-    </struct>
 </api>
diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h
index f7646d53b..8f9f90952 100644
--- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h
+++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h
@@ -28,8 +28,4 @@ typedef struct seL4_UserContext_ {
     seL4_Word tls_base, fs, gs;
 } seL4_UserContext;
 
-typedef struct seL4_VCPUContext_ {
-    seL4_Word eax, ebx, ecx, edx, esi, edi, ebp;
-} seL4_VCPUContext;
-
 #endif
diff --git a/libsel4/tools/syscall_stub_gen.py b/libsel4/tools/syscall_stub_gen.py
index 99a41762a..da223662d 100644
--- a/libsel4/tools/syscall_stub_gen.py
+++ b/libsel4/tools/syscall_stub_gen.py
@@ -294,6 +294,12 @@ def init_arch_types(wordsize):
             CapType("seL4_X86_PageDirectory", wordsize),
             CapType("seL4_X86_PageTable", wordsize),
             CapType("seL4_X86_IOPageTable", wordsize),
+            CapType("seL4_X86_VCPU", wordsize),
+            CapType("seL4_X86_EPTPML4", wordsize),
+            CapType("seL4_X86_EPTPDPT", wordsize),
+            CapType("seL4_X86_EPTPD", wordsize),
+            CapType("seL4_X86_EPTPT", wordsize),
+            StructType("seL4_VCPUContext", wordsize * 7 ,wordsize),
             StructType("seL4_UserContext", wordsize * 19, wordsize),
         ]
     }