From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY1hh-0004J6-2m for qemu-devel@nongnu.org; Mon, 12 Nov 2012 16:38:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TY1he-0004hH-0M for qemu-devel@nongnu.org; Mon, 12 Nov 2012 16:38:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17750) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY1hd-0004fg-OB for qemu-devel@nongnu.org; Mon, 12 Nov 2012 16:37:57 -0500 From: Eduardo Habkost Date: Mon, 12 Nov 2012 19:38:55 -0200 Message-Id: <1352756342-13716-11-git-send-email-ehabkost@redhat.com> In-Reply-To: <1352756342-13716-1-git-send-email-ehabkost@redhat.com> References: <1352756342-13716-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 10/17] target-i386: kill cpu_x86_register() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Cc: Don Slutz Move the cpu_x86_register() code inside cpu_x86_init(), as the initialization steps are going to be reordered. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index cef120e..3f04054 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1489,30 +1489,24 @@ static int cpudef_2_x86_cpu(X86CPU *cpu, X86CPUDefinition *def, Error **errp) return 0; } -static int cpu_x86_register(X86CPU *cpu, const char *cpu_model, Error **errp) -{ - X86CPUDefinition def1, *def = &def1; - - memset(def, 0, sizeof(*def)); - - if (cpu_x86_find_by_name(def, cpu_model) < 0) - return -1; - if (cpudef_2_x86_cpu(cpu, def, errp) < 0) - return -1; - return 0; -} - X86CPU *cpu_x86_init(const char *cpu_model) { X86CPU *cpu; CPUX86State *env; Error *error = NULL; + X86CPUDefinition def1, *def = &def1; cpu = X86_CPU(object_new(TYPE_X86_CPU)); env = &cpu->env; env->cpu_model_str = cpu_model; - if (cpu_x86_register(cpu, cpu_model, &error) < 0) { + memset(def, 0, sizeof(*def)); + + if (cpu_x86_find_by_name(def, cpu_model) < 0) { + goto error; + } + + if (cpudef_2_x86_cpu(cpu, def, &error) < 0) { goto error; } -- 1.7.11.7