From a57d0163e74a7f486203ef1f8ff1cb0218453457 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Mon, 6 Jun 2016 17:16:46 +0200 Subject: [PATCH] target-i386: Use cpu_generic_init() in cpu_x86_init() Now cpu_x86_init() does nothing more or less than duplicating cpu_generic_init() logic. So simplify it by using cpu_generic_init(). Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 7db632b8dd..329d85c3c9 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2226,25 +2226,7 @@ out: X86CPU *cpu_x86_init(const char *cpu_model) { - Error *error = NULL; - X86CPU *cpu; - - cpu = cpu_x86_create(cpu_model, &error); - if (error) { - goto out; - } - - object_property_set_bool(OBJECT(cpu), true, "realized", &error); - -out: - if (error) { - error_report_err(error); - if (cpu != NULL) { - object_unref(OBJECT(cpu)); - cpu = NULL; - } - } - return cpu; + return X86_CPU(cpu_generic_init(TYPE_X86_CPU, cpu_model)); } static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data) -- 2.11.0