From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sx8DG-0004mq-Ai for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sx8DB-000683-KF for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33869) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sx8DA-00067B-UA for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:01 -0400 From: Eduardo Habkost Date: Thu, 2 Aug 2012 23:59:22 -0300 Message-Id: <1343962766-22024-16-git-send-email-ehabkost@redhat.com> In-Reply-To: <1343962766-22024-1-git-send-email-ehabkost@redhat.com> References: <1343962766-22024-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 15/19] cpu_x86_create: move error handling to end of function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index f30e621..7821331 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1489,12 +1489,15 @@ X86CPU *cpu_x86_create(const char *cpu_model) env = &cpu->env; env->cpu_model_str = cpu_model; if (cpu_x86_register(cpu, cpu_model) < 0) { - object_delete(OBJECT(cpu)); - return NULL; + goto error; } x86_cpu_realize(OBJECT(cpu), NULL); return cpu; + +error: + object_delete(OBJECT(cpu)); + return NULL; } #if !defined(CONFIG_USER_ONLY) -- 1.7.11.2