[Xen-changelog] [xen-3.2-testing] x86_emulate: Fix out-of-tree test harness build.

["Xen patchbot-3.2-testing" <patchbot-3.2-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1206384923 0
# Node ID 9f4bd4e62e74d6a3f73a5a793f5ca97725db49b1
# Parent  56f514e0bbbe8c314c502fc0859e4821f024afbe
x86_emulate: Fix out-of-tree test harness build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/x86_emulate.c        |    1 +
 xen/include/asm-x86/x86_emulate.h |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff -r 56f514e0bbbe -r 9f4bd4e62e74 xen/arch/x86/x86_emulate.c
--- a/xen/arch/x86/x86_emulate.c        Mon Mar 24 15:40:08 2008 +0000
+++ b/xen/arch/x86/x86_emulate.c        Mon Mar 24 18:55:23 2008 +0000
@@ -24,6 +24,7 @@
 #ifndef __XEN__
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 #include <public/xen.h>
 #else
 #include <xen/config.h>
diff -r 56f514e0bbbe -r 9f4bd4e62e74 xen/include/asm-x86/x86_emulate.h
--- a/xen/include/asm-x86/x86_emulate.h Mon Mar 24 15:40:08 2008 +0000
+++ b/xen/include/asm-x86/x86_emulate.h Mon Mar 24 18:55:23 2008 +0000
@@ -56,17 +56,17 @@ enum x86_segment {
  * segment descriptor. It happens to match the format of an AMD SVM VMCB.
  */
 typedef union segment_attributes {
-    u16 bytes;
+    uint16_t bytes;
     struct
     {
-        u16 type:4;    /* 0;  Bit 40-43 */
-        u16 s:   1;    /* 4;  Bit 44 */
-        u16 dpl: 2;    /* 5;  Bit 45-46 */
-        u16 p:   1;    /* 7;  Bit 47 */
-        u16 avl: 1;    /* 8;  Bit 52 */
-        u16 l:   1;    /* 9;  Bit 53 */
-        u16 db:  1;    /* 10; Bit 54 */
-        u16 g:   1;    /* 11; Bit 55 */
+        uint16_t type:4;    /* 0;  Bit 40-43 */
+        uint16_t s:   1;    /* 4;  Bit 44 */
+        uint16_t dpl: 2;    /* 5;  Bit 45-46 */
+        uint16_t p:   1;    /* 7;  Bit 47 */
+        uint16_t avl: 1;    /* 8;  Bit 52 */
+        uint16_t l:   1;    /* 9;  Bit 53 */
+        uint16_t db:  1;    /* 10; Bit 54 */
+        uint16_t g:   1;    /* 11; Bit 55 */
     } fields;
 } __attribute__ ((packed)) segment_attributes_t;
 
@@ -75,10 +75,10 @@ typedef union segment_attributes {
  * Again, this happens to match the format of an AMD SVM VMCB.
  */
 struct segment_register {
-    u16        sel;
+    uint16_t        sel;
     segment_attributes_t attr;
-    u32        limit;
-    u64        base;
+    uint32_t        limit;
+    uint64_t        base;
 } __attribute__ ((packed));
 
 /*

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog