From patchwork Tue Apr 3 00:05:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 150302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 35865B6FD9 for ; Tue, 3 Apr 2012 10:27:12 +1000 (EST) Received: from localhost ([::1]:35527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SErGB-0007pz-ET for incoming@patchwork.ozlabs.org; Mon, 02 Apr 2012 20:06:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SErFQ-0005dO-Si for qemu-devel@nongnu.org; Mon, 02 Apr 2012 20:05:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SErFO-0000xa-17 for qemu-devel@nongnu.org; Mon, 02 Apr 2012 20:05:20 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37595 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SErFN-0000x7-OZ for qemu-devel@nongnu.org; Mon, 02 Apr 2012 20:05:17 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id A99538FC92; Tue, 3 Apr 2012 02:05:16 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 3 Apr 2012 02:05:10 +0200 Message-Id: <1333411511-10139-4-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1333411511-10139-1-git-send-email-afaerber@suse.de> References: <1333411511-10139-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Jan Kiszka , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Subject: [Qemu-devel] [PATCH v2 3/4] target-i386: QOM'ify CPU init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move code from cpu_x86_init() to new QOM x86_cpu_initfn(). Also move mce_init() to cpu.c since it's used nowhere else. Signed-off-by: Andreas Färber --- target-i386/cpu.c | 27 +++++++++++++++++++++++++++ target-i386/helper.c | 18 ------------------ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 36790da..f4463e1 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1380,6 +1380,32 @@ static void x86_cpu_reset(CPUState *s) cpu_state_reset(env); } +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); + CPUX86State *env = &cpu->env; + + cpu_exec_init(env); + env->cpuid_apic_id = env->cpu_index; + mce_init(cpu); +} + static void x86_cpu_common_class_init(ObjectClass *oc, void *data) { X86CPUClass *xcc = X86_CPU_CLASS(oc); @@ -1393,6 +1419,7 @@ static const TypeInfo x86_cpu_type_info = { .name = TYPE_X86_CPU, .parent = TYPE_CPU, .instance_size = sizeof(X86CPU), + .instance_init = x86_cpu_initfn, .abstract = false, .class_size = sizeof(X86CPUClass), .class_init = x86_cpu_common_class_init, diff --git a/target-i386/helper.c b/target-i386/helper.c index fb87975..d8ceee1 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1197,21 +1197,6 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) } #endif /* !CONFIG_USER_ONLY */ -static void mce_init(CPUX86State *cenv) -{ - 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_get_descr_debug(CPUX86State *env, unsigned int selector, target_ulong *base, unsigned int *limit, unsigned int *flags) @@ -1249,7 +1234,6 @@ CPUX86State *cpu_x86_init(const char *cpu_model) cpu = X86_CPU(object_new(TYPE_X86_CPU)); env = &cpu->env; - cpu_exec_init(env); env->cpu_model_str = cpu_model; /* init various static tables used in TCG mode */ @@ -1265,8 +1249,6 @@ CPUX86State *cpu_x86_init(const char *cpu_model) object_delete(OBJECT(cpu)); return NULL; } - env->cpuid_apic_id = env->cpu_index; - mce_init(env); qemu_init_vcpu(env);