| Message ID | 1462558292-2126-3-git-send-email-ehabkost@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 6 May 2016 15:11:25 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: > QOM instance_init functions are not supposed to have any side-effects, > as new objects may be created at any moment for querying property > information (see qmp_device_list_properties()). > > Move TCG initialization to realize time so it won't be called when just > doing object_new() on a X86CPU subclass. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > Changes v1 -> v2: > * Now the inited/tcg_initialized variable doesn't exist anymore > * Move tcg_x86_init() call after basic parameter validation inside > realizefn > --- > target-i386/cpu.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index a689fec..bde649a 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -2901,6 +2901,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) > } > > > + if (tcg_enabled()) { > + tcg_x86_init(); > + } > + > #ifndef CONFIG_USER_ONLY > qemu_register_reset(x86_cpu_machine_reset_cb, cpu); > > @@ -3135,11 +3139,6 @@ static void x86_cpu_initfn(Object *obj) > } > > x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort); > - > - /* init various static tables used in TCG mode */ > - if (tcg_enabled()) { > - tcg_x86_init(); > - } > } > > static int64_t x86_cpu_get_arch_id(CPUState *cs)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a689fec..bde649a 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2901,6 +2901,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) } + if (tcg_enabled()) { + tcg_x86_init(); + } + #ifndef CONFIG_USER_ONLY qemu_register_reset(x86_cpu_machine_reset_cb, cpu); @@ -3135,11 +3139,6 @@ static void x86_cpu_initfn(Object *obj) } x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort); - - /* init various static tables used in TCG mode */ - if (tcg_enabled()) { - tcg_x86_init(); - } } static int64_t x86_cpu_get_arch_id(CPUState *cs)
QOM instance_init functions are not supposed to have any side-effects, as new objects may be created at any moment for querying property information (see qmp_device_list_properties()). Move TCG initialization to realize time so it won't be called when just doing object_new() on a X86CPU subclass. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Changes v1 -> v2: * Now the inited/tcg_initialized variable doesn't exist anymore * Move tcg_x86_init() call after basic parameter validation inside realizefn --- target-i386/cpu.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)