From patchwork Wed May 9 22:09: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: 158052 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 E6A43B6FB7 for ; Thu, 10 May 2012 08:09:34 +1000 (EST) Received: from localhost ([::1]:41178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSF4e-0004Bn-Bh for incoming@patchwork.ozlabs.org; Wed, 09 May 2012 18:09:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSF4X-0004BS-JK for qemu-devel@nongnu.org; Wed, 09 May 2012 18:09:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSF4V-0002hj-J6 for qemu-devel@nongnu.org; Wed, 09 May 2012 18:09:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:57664 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSF4V-0002gP-9b for qemu-devel@nongnu.org; Wed, 09 May 2012 18:09:23 -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 AECCD970AD; Thu, 10 May 2012 00:09:21 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 10 May 2012 00:09:10 +0200 Message-Id: <1336601350-19772-1-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 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: Eduardo Habkost , Michael Roth , Anthony Liguori , Paolo Bonzini , imammedo@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH for-1.1] target-i386: Defer MCE 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 Commit de024815e3b523addf58f1f79846b7fe74643678 (target-i386: QOM'ify CPU init) moved mce_init() call from helper.c:cpu_x86_init() into X86CPU's cpu.c:x86_cpu_initfn(). mce_init() checks for a family >= 6 though, so we could end up with a sequence such as for -cpu somecpu,family=6: x86_cpu_initfn => X86CPU::family == 5 mce_init => no-op cpu_x86_register => X86CPU::family = 6 => MCE unexpectedly not init'ed or for -cpu someothercpu,family=5: x86_cpu_initfn => X86CPU::family == 6 mce_init => init'ed cpu_x86_register => X86CPU::family = 5 => MCE unexpectedly init'ed Therefore partially revert the above commit. To avoid moving mce_init() back into helper.c, foresightedly move it into a new x86_cpu_realize() function and, in lack of ObjectClass::realize, call it directly from cpu_x86_init(). While at it, move the qemu_init_vcpu() call that used to follow mce_init() in cpu_x86_init() into the new realizefn as well. Reported-by: Igor Mammedov Signed-off-by: Andreas Färber Cc: Anthony Liguori Cc: Paolo Bonzini Cc: Eduardo Habkost Cc: Michael Roth Reviewed-by: Igor Mammedov --- target-i386/cpu-qom.h | 4 ++++ target-i386/cpu.c | 9 ++++++++- target-i386/helper.c | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h index 40635c4..5901140 100644 --- a/target-i386/cpu-qom.h +++ b/target-i386/cpu-qom.h @@ -22,6 +22,7 @@ #include "qemu/cpu.h" #include "cpu.h" +#include "error.h" #ifdef TARGET_X86_64 #define TYPE_X86_CPU "x86_64-cpu" @@ -71,5 +72,8 @@ static inline X86CPU *x86_env_get_cpu(CPUX86State *env) #define ENV_GET_CPU(e) CPU(x86_env_get_cpu(e)) +/* TODO Drop once ObjectClass::realize is available */ +void x86_cpu_realize(Object *obj, Error **errp); + #endif diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 65d9af6..89b4ac7 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1722,6 +1722,14 @@ static void mce_init(X86CPU *cpu) } } +void x86_cpu_realize(Object *obj, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + + mce_init(cpu); + qemu_init_vcpu(&cpu->env); +} + static void x86_cpu_initfn(Object *obj) { X86CPU *cpu = X86_CPU(obj); @@ -1755,7 +1763,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) diff --git a/target-i386/helper.c b/target-i386/helper.c index 0b22582..3421be2 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1181,7 +1181,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model) return NULL; } - qemu_init_vcpu(env); + x86_cpu_realize(OBJECT(cpu), NULL); return env; }