target-i386: Eliminate unnecessary get_cpuid_vendor() function

[mirror_qemu.git] / target-i386 / cpu.c

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index f6a7671f0d552e3a59e6330f31a676f249e57bc9..2f3a4504eae7dbc87431444fa9ec775f0f068c0a 100644 (file)
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2135,30 +2135,27 @@ out:
     return cpu;
 }
 
-CPUX86State *cpu_x86_init_user(const char *cpu_model)
+X86CPU *cpu_x86_init(const char *cpu_model)
 {
     Error *error = NULL;
     X86CPU *cpu;
 
     cpu = cpu_x86_create(cpu_model, NULL, &error);
     if (error) {
-        goto error;
+        goto out;
     }
 
     object_property_set_bool(OBJECT(cpu), true, "realized", &error);
-    if (error) {
-        goto error;
-    }
 
-    return &cpu->env;
-
-error:
-    error_report("%s", error_get_pretty(error));
-    error_free(error);
-    if (cpu != NULL) {
-        object_unref(OBJECT(cpu));
+out:
+    if (error) {
+        error_report_err(error);
+        if (cpu != NULL) {
+            object_unref(OBJECT(cpu));
+            cpu = NULL;
+        }
     }
-    return NULL;
+    return cpu;
 }
 
 static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data)