Merge remote branch 'amit/for-anthony' into staging

[qemu.git] / target-i386 / cpu.h

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 75156e761a520fa9af7eee226e019f8b933b3be9..c7047d5912422c2e9c91be7aaf875674b9b9b8bc 100644 (file)
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -685,8 +685,6 @@ typedef struct CPUX86State {
 
     uint64_t tsc;
 
 
     uint64_t tsc;
 

-    uint64_t pat;
-

     uint64_t mcg_status;
 
     /* exception/interrupt handling */
     uint64_t mcg_status;
 
     /* exception/interrupt handling */


@@ -707,6 +705,8 @@ typedef struct CPUX86State {
 
     CPU_COMMON
 
 
     CPU_COMMON
 

+    uint64_t pat;
+

     /* processor features (e.g. for CPUID insn) */
     uint32_t cpuid_level;
     uint32_t cpuid_vendor1;
     /* processor features (e.g. for CPUID insn) */
     uint32_t cpuid_level;
     uint32_t cpuid_vendor1;


@@ -986,4 +986,12 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
 
 void do_cpu_init(CPUState *env);
 void do_cpu_sipi(CPUState *env);
 
 void do_cpu_init(CPUState *env);
 void do_cpu_sipi(CPUState *env);

+
+#define MCE_INJECT_BROADCAST    1
+#define MCE_INJECT_UNCOND_AO    2
+
+void cpu_x86_inject_mce(Monitor *mon, CPUState *cenv, int bank,
+                        uint64_t status, uint64_t mcg_status, uint64_t addr,
+                        uint64_t misc, int flags);
+

 #endif /* CPU_I386_H */
 #endif /* CPU_I386_H */