From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=35930 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PaSQG-00026F-GB for qemu-devel@nongnu.org; Wed, 05 Jan 2011 07:25:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PaSQE-0002Xg-U0 for qemu-devel@nongnu.org; Wed, 05 Jan 2011 07:25:00 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:53440) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PaSQE-0002XJ-MZ for qemu-devel@nongnu.org; Wed, 05 Jan 2011 07:24:58 -0500 Message-ID: <4D246318.4040104@web.de> Date: Wed, 05 Jan 2011 13:24:56 +0100 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] x86: Perform implicit mcg_status reset List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , Anthony Liguori Cc: Huang Ying From: Jan Kiszka Reorder mcg_status in CPUState to achive automatic clearing on reset. Signed-off-by: Jan Kiszka --- 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