From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aykER-0003DO-QD for qemu-devel@nongnu.org; Fri, 06 May 2016 14:12:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aykEG-000404-3R for qemu-devel@nongnu.org; Fri, 06 May 2016 14:12:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aykEF-0003um-UE for qemu-devel@nongnu.org; Fri, 06 May 2016 14:11:56 -0400 From: Eduardo Habkost Date: Fri, 6 May 2016 15:11:25 -0300 Message-Id: <1462558292-2126-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1462558292-2126-1-git-send-email-ehabkost@redhat.com> References: <1462558292-2126-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/9] target-i386: Move TCG initialization to realize time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jiri Denemark , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Igor Mammedov , libvir-list@redhat.com 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 --- 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) -- 2.5.5