[Qemu-devel] [PATCH] x86: Perform implicit mcg_status reset

[Jan Kiszka]

From: Jan Kiszka <address@hidden>

Reorder mcg_status in CPUState to achive automatic clearing on reset.

Signed-off-by: Jan Kiszka <address@hidden>
---
 target-i386/cpu.h    |    3 ++-
 target-i386/helper.c |    2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index f0c07cd..0972725 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -687,6 +687,8 @@ typedef struct CPUX86State {

     uint64_t pat;

+    uint64_t mcg_status;
+
     /* exception/interrupt handling */
     int error_code;
     int exception_is_int;
@@ -738,7 +740,6 @@ typedef struct CPUX86State {
     struct DeviceState *apic_state;

     uint64_t mcg_cap;
-    uint64_t mcg_status;
     uint64_t mcg_ctl;
     uint64_t mce_banks[MCE_BANKS_DEF*4];

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 25a3e36..4f97c55 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -101,8 +101,6 @@ void cpu_reset(CPUX86State *env)
     env->dr[7] = DR7_FIXED_1;
     cpu_breakpoint_remove_all(env, BP_CPU);
     cpu_watchpoint_remove_all(env, BP_CPU);
-
-    env->mcg_status = 0;
 }

 void cpu_x86_close(CPUX86State *env)
-- 
1.7.1