| Message ID | 1442605096-14103-4-git-send-email-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index f054a69..2e5a303 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2832,6 +2832,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) goto out; } + if (tcg_enabled()) { + tcg_x86_init(); + } + #ifndef CONFIG_USER_ONLY qemu_register_reset(x86_cpu_machine_reset_cb, cpu); @@ -3069,11 +3073,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(-)