[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/11] target-i386: Simplify error handling on cpu_x8
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 06/11] target-i386: Simplify error handling on cpu_x86_init_user() |
Date: |
Wed, 25 Feb 2015 16:58:21 -0300 |
Isolate error handling path from the "if (error)" checks.
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index aee4d3e..f6a7671 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2142,21 +2142,23 @@ CPUX86State *cpu_x86_init_user(const char *cpu_model)
cpu = cpu_x86_create(cpu_model, NULL, &error);
if (error) {
- goto out;
+ goto error;
}
object_property_set_bool(OBJECT(cpu), true, "realized", &error);
-
-out:
if (error) {
- error_report("%s", error_get_pretty(error));
- error_free(error);
- if (cpu != NULL) {
- object_unref(OBJECT(cpu));
- }
- return NULL;
+ goto error;
}
+
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)
--
2.1.0
[Qemu-devel] [PULL 06/11] target-i386: Simplify error handling on cpu_x86_init_user(),
Eduardo Habkost <=
[Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors, Eduardo Habkost, 2015/02/25
- Re: [Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors, Andreas Färber, 2015/02/25
- Re: [Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors, Peter Maydell, 2015/02/25
- Re: [Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors, Eduardo Habkost, 2015/02/26
- Re: [Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors, Peter Maydell, 2015/02/26
- Re: [Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors, Eduardo Habkost, 2015/02/26
- Re: [Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors, Peter Maydell, 2015/02/26
- Re: [Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors, Eduardo Habkost, 2015/02/26
- Re: [Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors, Peter Maydell, 2015/02/26
- Re: [Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors, Eduardo Habkost, 2015/02/27