From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIjKL-00036k-KZ for qemu-devel@nongnu.org; Tue, 03 Feb 2015 14:40:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIjKK-0006zg-Oz for qemu-devel@nongnu.org; Tue, 03 Feb 2015 14:40:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52607) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIjKK-0006zY-Il for qemu-devel@nongnu.org; Tue, 03 Feb 2015 14:40:00 -0500 From: Eduardo Habkost Date: Tue, 3 Feb 2015 17:39:26 -0200 Message-Id: <1422992371-4145-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1422992371-4145-1-git-send-email-ehabkost@redhat.com> References: <1422992371-4145-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/9] target-i386: Simplify error handling on cpu_x86_init_user() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gu Zheng , Igor Mammedov , Paolo Bonzini Isolate error handling path from the "if (error)" checks. Signed-off-by: Eduardo Habkost --- 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