From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSC8r-0006eP-Hn for qemu-devel@nongnu.org; Wed, 09 May 2012 15:01:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSC8p-0007oa-Mc for qemu-devel@nongnu.org; Wed, 09 May 2012 15:01:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2955) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSC8p-0007oP-EC for qemu-devel@nongnu.org; Wed, 09 May 2012 15:01:39 -0400 From: Igor Mammedov Date: Wed, 9 May 2012 21:01:29 +0200 Message-Id: <1336590089-30154-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH for 1.1-rc1] mce_init should be called after parsing cpu_model List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, aliguori@us.ibm.com, afaerber@suse.de, ehabkost@redhat.com Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 65d9af6..5d11e7b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1153,6 +1153,22 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf, const char *optarg) } } +static void mce_init(X86CPU *cpu) +{ + CPUX86State *cenv = &cpu->env; + unsigned int bank; + + if (((cenv->cpuid_version >> 8) & 0xf) >= 6 + && (cenv->cpuid_features & (CPUID_MCE | CPUID_MCA)) == + (CPUID_MCE | CPUID_MCA)) { + cenv->mcg_cap = MCE_CAP_DEF | MCE_BANKS_DEF; + cenv->mcg_ctl = ~(uint64_t)0; + for (bank = 0; bank < MCE_BANKS_DEF; bank++) { + cenv->mce_banks[bank * 4] = ~(uint64_t)0; + } + } +} + int cpu_x86_register(X86CPU *cpu, const char *cpu_model) { CPUX86State *env = &cpu->env; @@ -1204,6 +1220,8 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) error_free(error); return -1; } + + mce_init(cpu); return 0; } @@ -1706,22 +1724,6 @@ static void x86_cpu_reset(CPUState *s) cpu_watchpoint_remove_all(env, BP_CPU); } -static void mce_init(X86CPU *cpu) -{ - CPUX86State *cenv = &cpu->env; - unsigned int bank; - - if (((cenv->cpuid_version >> 8) & 0xf) >= 6 - && (cenv->cpuid_features & (CPUID_MCE | CPUID_MCA)) == - (CPUID_MCE | CPUID_MCA)) { - cenv->mcg_cap = MCE_CAP_DEF | MCE_BANKS_DEF; - cenv->mcg_ctl = ~(uint64_t)0; - for (bank = 0; bank < MCE_BANKS_DEF; bank++) { - cenv->mce_banks[bank * 4] = ~(uint64_t)0; - } - } -} - static void x86_cpu_initfn(Object *obj) { X86CPU *cpu = X86_CPU(obj); @@ -1755,7 +1757,6 @@ static void x86_cpu_initfn(Object *obj) x86_cpuid_set_tsc_freq, NULL, NULL, NULL); env->cpuid_apic_id = env->cpu_index; - mce_init(cpu); } static void x86_cpu_common_class_init(ObjectClass *oc, void *data) -- 1.7.7.6