[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/9] target-i386: Simplify error handling on cpu_
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v2 4/9] target-i386: Simplify error handling on cpu_x86_init_user() |
Date: |
Tue, 3 Feb 2015 17:39:26 -0200 |
Isolate error handling path from the "if (error)" checks.
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 43d958e..632a1ba 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2156,21 +2156,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] [PATCH v2 0/9] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 2/9] target-i386: Rename cpu_x86_init() to cpu_x86_init_user(), Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 3/9] target-i386: Eliminate cpu_init() function, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 1/9] target-i386: Move topology.h to include/hw/i386, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 4/9] target-i386: Simplify error handling on cpu_x86_init_user(),
Eduardo Habkost <=
- [Qemu-devel] [PATCH v2 5/9] target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 9/9] target-i386: Move APIC ID compatibility code to pc.c, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 6/9] linux-user: Check for cpu_init() errors, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 7/9] target-i386: Set APIC ID using cpu_index on CONFIG_USER, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 8/9] target-i386: Require APIC ID to be explicitly set before CPU realize, Eduardo Habkost, 2015/02/03
- Re: [Qemu-devel] [PATCH v2 0/9] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Paolo Bonzini, 2015/02/04