Am 20.06.2012 14:59, schrieb Igor Mammedov: > It's not correct to make CPU runnable (i.e. calling x86_cpu_realize()) > when not all properties are set (APIC in this case). > > Fix it by calling x86_cpu_realize() at board level after APIC is > initialized, right before cpu_reset(). > > Signed-off-by: Igor Mammedov <imamm...@redhat.com> > --- > hw/pc.c | 1 + > target-i386/helper.c | 2 -- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/hw/pc.c b/hw/pc.c > index 8368701..8a662cf 100644 > --- a/hw/pc.c > +++ b/hw/pc.c > @@ -948,6 +948,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model) > env->apic_state = apic_init(env, env->cpuid_apic_id); > } > qemu_register_reset(pc_cpu_reset, cpu); > + x86_cpu_realize(OBJECT(cpu), NULL); > pc_cpu_reset(cpu); > return cpu; > } > diff --git a/target-i386/helper.c b/target-i386/helper.c > index c52ec13..b38ea7f 100644 > --- a/target-i386/helper.c > +++ b/target-i386/helper.c > @@ -1161,8 +1161,6 @@ X86CPU *cpu_x86_init(const char *cpu_model) > return NULL; > } > > - x86_cpu_realize(OBJECT(cpu), NULL); > - > return cpu; > } >
This will require changes in linux-user and possibly bsd-user. Having a cpu_realize() would probably help with avoiding #ifdef'ery. Unfortunately deriving CPUState from DeviceState proves a bit difficult in the meantime (it worked at one point, now there's lots of circular header dependencies), and realize support for Object got stopped. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
