ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-i386: Simplify error handling on cpu_x86_init_user() 

Isolate error handling path from the "if (error)" checks.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2014-12-19 14:51:00 -02:00
parent 15258d46ba
commit 18b0e4e771
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target-i386/cpu.c
View File

@ -2142,21 +2142,23 @@ CPUX86State *cpu_x86_init_user(const char *cpu_model)
cpu = cpu_x86_create(cpu_model, NULL, &error); cpu = cpu_x86_create(cpu_model, NULL, &error);
if (error) { if (error) {
goto out; goto error;
} }
object_property_set_bool(OBJECT(cpu), true, "realized", &error); object_property_set_bool(OBJECT(cpu), true, "realized", &error);
out:
if (error) { if (error) {
error_report("%s", error_get_pretty(error)); goto error;
error_free(error);
if (cpu != NULL) {
object_unref(OBJECT(cpu));
}
return NULL;
} }
return &cpu->env; return &cpu->env;
error:
error_report("%s", error_get_pretty(error));
error_free(error);
if (cpu != NULL) {
object_unref(OBJECT(cpu));
}
return NULL;
} }
static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data) static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data)