[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] target-i386: Defer MCE init
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 3/7] target-i386: Defer MCE init |
Date: |
Sun, 13 May 2012 20:27:41 +0200 |
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 <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---
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;
}
--
1.7.7
- [Qemu-devel] [PULL for-1.1-rc2] Fixes from QOM-related series, Andreas Färber, 2012/05/13
- [Qemu-devel] [PATCH 2/7] qom: Documentation addition for object_class_by_name(), Andreas Färber, 2012/05/13
- [Qemu-devel] [PATCH 1/7] target-mips: Remove commented-out function declaration, Andreas Färber, 2012/05/13
- [Qemu-devel] [PATCH 5/7] qdev: Fix adding of ptr properties, Andreas Färber, 2012/05/13
- [Qemu-devel] [PATCH 6/7] pc: Add back PCI.rombar compat property, Andreas Färber, 2012/05/13
- [Qemu-devel] [PATCH 4/7] qdev: Use object_property_print() in info qtree, Andreas Färber, 2012/05/13
- [Qemu-devel] [PATCH 7/7] mips_fulong2e: Don't register "cpu" VMState twice, Andreas Färber, 2012/05/13
- [Qemu-devel] [PATCH 3/7] target-i386: Defer MCE init,
Andreas Färber <=
- Re: [Qemu-devel] [PULL for-1.1-rc2] Fixes from QOM-related series, Luiz Capitulino, 2012/05/14
- Re: [Qemu-devel] [PULL for-1.1-rc2] Fixes from QOM-related series, Anthony Liguori, 2012/05/14