[Qemu-devel] [PATCH 16/20] small changes in headers needed to acomodate kvm files as is.

[Glauber Costa <gcosta@redhat.com>]

---
 cpu-defs.h        |    1 +
 target-i386/cpu.h |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/cpu-defs.h b/cpu-defs.h
index e197686..899ac65 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -169,6 +169,7 @@ typedef struct CPUTLBEntry {
     void *next_cpu; /* next CPU sharing TB cache */                     \
     int cpu_index; /* CPU index (informative) */                        \
     int running; /* Nonzero if cpu is currently running(usermode).  */  \
+    int thread_id;                                                      \
     /* user data */                                                     \
     void *opaque;                                                       \
                                                                         \
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 5798cf3..38aab1b 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -199,7 +199,8 @@
 #define CR4_PAE_MASK  (1 << 5)
 #define CR4_PGE_MASK  (1 << 7)
 #define CR4_PCE_MASK  (1 << 8)
-#define CR4_OSFXSR_MASK (1 << 9)
+#define CR4_OSFXSR_SHIFT 9
+#define CR4_OSFXSR_MASK (1 << CR4_OSFXSR_SHIFT)
 #define CR4_OSXMMEXCPT_MASK  (1 << 10)
 
 #define PG_PRESENT_BIT	0
@@ -595,6 +596,7 @@ typedef struct CPUX86State {
     int kqemu_enabled;
     int last_io_time;
 #endif
+
     /* in order to simplify APIC support, we leave this pointer to the
        user */
     struct APICState *apic_state;
-- 
1.5.5.1