[Qemu-devel] [RFC 16/19] kill cpu_x86_register()

[Eduardo Habkost <ehabkost@redhat.com>]

We will need to reorder parts the CPU object creation code, so move
cpu_x86_register() code into the cpu_x86_create() function to make it possible.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target-i386/cpu.c | 25 ++++++++-----------------
 target-i386/cpu.h |  1 -
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 7821331..751cf90 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1463,32 +1463,23 @@ static int cpu_x86_init_from_def(X86CPU *cpu, X86CPUDefinition *def)
     return 0;
 }
 
-int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
+X86CPU *cpu_x86_create(const char *cpu_model)
 {
+    X86CPU *cpu;
+    CPUX86State *env;
     X86CPUDefinition def1, *def = &def1;
 
+    cpu = X86_CPU(object_new(TYPE_X86_CPU));
+    env = &cpu->env;
+    env->cpu_model_str = cpu_model;
+
     memset(def, 0, sizeof(*def));
 
     if (cpu_x86_build_from_name(def, cpu_model) < 0) {
-        return -1;
+        goto error;
     }
 
     if (cpu_x86_init_from_def(cpu, def) < 0) {
-        return -1;
-    }
-
-    return 0;
-}
-
-X86CPU *cpu_x86_create(const char *cpu_model)
-{
-    X86CPU *cpu;
-    CPUX86State *env;
-
-    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) {
         goto error;
     }
 
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 436ff86..c1c1194 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -928,7 +928,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
                    uint32_t *eax, uint32_t *ebx,
                    uint32_t *ecx, uint32_t *edx);
 X86CPU *cpu_x86_create(const char *cpu_model);
-int cpu_x86_register(X86CPU *cpu, const char *cpu_model);
 void cpu_clear_apic_feature(CPUX86State *env);
 void host_cpuid(uint32_t function, uint32_t count,
                 uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
-- 
1.7.11.2