From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sx8DC-0004gq-6t for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sx8DA-00066q-7I for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1526) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sx8D9-00066P-V5 for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:00 -0400 From: Eduardo Habkost Date: Thu, 2 Aug 2012 23:59:16 -0300 Message-Id: <1343962766-22024-10-git-send-email-ehabkost@redhat.com> In-Reply-To: <1343962766-22024-1-git-send-email-ehabkost@redhat.com> References: <1343962766-22024-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 09/19] i386: reorder object setup on cpu_x86_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= The object creation will be moved to cpu.c, with all the rest of the CPU model handling. Signed-off-by: Eduardo Habkost --- target-i386/helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index b748d90..5a7eb56 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1157,10 +1157,6 @@ X86CPU *cpu_x86_init(const char *cpu_model) CPUX86State *env; static int inited; - cpu = X86_CPU(object_new(TYPE_X86_CPU)); - env = &cpu->env; - env->cpu_model_str = cpu_model; - /* init various static tables used in TCG mode */ if (tcg_enabled() && !inited) { inited = 1; @@ -1170,6 +1166,10 @@ X86CPU *cpu_x86_init(const char *cpu_model) cpu_set_debug_excp_handler(breakpoint_handler); #endif } + + cpu = X86_CPU(object_new(TYPE_X86_CPU)); + env = &cpu->env; + env->cpu_model_str = cpu_model; if (cpu_x86_register(cpu, cpu_model) < 0) { object_delete(OBJECT(cpu)); return NULL; -- 1.7.11.2