Received: from eggs.gnu.org ([2001:4830:134:3::10]:59839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zd1Uy-0004d8-10 for qemu-devel@nongnu.org; Fri, 18 Sep 2015 15:39:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zd1Ut-0002AK-2Z for qemu-devel@nongnu.org; Fri, 18 Sep 2015 15:39:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45743) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zd1Us-0002AE-Ul for qemu-devel@nongnu.org; Fri, 18 Sep 2015 15:39:03 -0400 From: Eduardo Habkost Date: Fri, 18 Sep 2015 16:38:16 -0300 Message-Id: <1442605096-14103-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1442605096-14103-1-git-send-email-ehabkost@redhat.com> References: <1442605096-14103-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/4] target-i386: Call cpu_exec_init() on realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zhugh.fnst@cn.fujitsu.com, tangchen@cn.fujitsu.com, chen.fan.fnst@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, Paolo Bonzini , Gu Zheng , Igor Mammedov , anshul.makkar@profitbricks.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= 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()). Calling cpu_exec_init() also affects QEMU's ability to handle errors during CPU creation, as some actions done by cpu_exec_init() can't be reverted. Move cpu_exec_init() call to realize so a simple object_new() won't trigger it, and so that it is called after some basic validation of CPU parameters. Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Call cpu_exec_init() after basic parameter validation --- target-i386/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 2e5a303..19d1525 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2832,6 +2832,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) goto out; } + cpu_exec_init(cs, &error_abort); + if (tcg_enabled()) { tcg_x86_init(); } @@ -3027,7 +3029,6 @@ static void x86_cpu_initfn(Object *obj) FeatureWord w; cs->env_ptr = env; - cpu_exec_init(cs, &error_abort); object_property_add(obj, "family", "int", x86_cpuid_version_get_family, -- 2.1.0