| Message ID | 1336601350-19772-1-git-send-email-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
----- Original Message ----- > From: "Andreas Färber" <afaerber@suse.de> > To: qemu-devel@nongnu.org > Cc: "Eduardo Habkost" <ehabkost@redhat.com>, "Michael Roth" <mdroth@linux.vnet.ibm.com>, "Anthony Liguori" > <anthony@codemonkey.ws>, "Paolo Bonzini" <pbonzini@redhat.com>, imammedo@redhat.com, "Andreas Färber" > <afaerber@suse.de> > Sent: Thursday, May 10, 2012 12:09:10 AM > Subject: [Qemu-devel] [PATCH for-1.1] target-i386: Defer MCE init > > 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 <imammedo@redhat.com> > Signed-off-by: Andreas Färber <afaerber@suse.de> > Cc: Anthony Liguori <anthony@codemonkey.ws> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Eduardo Habkost <ehabkost@redhat.com> > Cc: Michael Roth <mdroth@linux.vnet.ibm.com> > --- > 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 > Looks good to me. Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Am 10.05.2012 21:14, schrieb Igor Mammedov: > ----- Original Message ----- >> From: "Andreas Färber" <afaerber@suse.de> >> To: qemu-devel@nongnu.org >> Cc: "Eduardo Habkost" <ehabkost@redhat.com>, "Michael Roth" <mdroth@linux.vnet.ibm.com>, "Anthony Liguori" >> <anthony@codemonkey.ws>, "Paolo Bonzini" <pbonzini@redhat.com>, imammedo@redhat.com, "Andreas Färber" >> <afaerber@suse.de> >> Sent: Thursday, May 10, 2012 12:09:10 AM >> Subject: [Qemu-devel] [PATCH for-1.1] target-i386: Defer MCE init >> >> 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 <imammedo@redhat.com> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> Cc: Anthony Liguori <anthony@codemonkey.ws> >> Cc: Paolo Bonzini <pbonzini@redhat.com> >> Cc: Eduardo Habkost <ehabkost@redhat.com> >> Cc: Michael Roth <mdroth@linux.vnet.ibm.com> >> --- >> target-i386/cpu-qom.h | 4 ++++ >> target-i386/cpu.c | 9 ++++++++- >> target-i386/helper.c | 2 +- >> 3 files changed, 13 insertions(+), 2 deletions(-) > > Looks good to me. > > Reviewed-by: Igor Mammedov <imammedo@redhat.com> Thanks, I've applied it to qom-1.1 and qom-next branches for now: http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/qom-1.1 http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/qom-next Andreas
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; }
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 <imammedo@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de> Cc: Anthony Liguori <anthony@codemonkey.ws> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> Cc: Michael Roth <mdroth@linux.vnet.ibm.com> --- target-i386/cpu-qom.h | 4 ++++ target-i386/cpu.c | 9 ++++++++- target-i386/helper.c | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-)