From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJY4-0001cZ-VQ for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:04:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQJXv-0000Zo-1f for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:04:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59451) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJXu-0000Za-MI for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:04:02 -0400 From: Igor Mammedov Date: Mon, 22 Oct 2012 17:02:49 +0200 Message-Id: <1350918203-25198-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1350918203-25198-1-git-send-email-imammedo@redhat.com> References: <1350918203-25198-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 03/37] target-i386: if x86_cpu_realize() failed report error and do cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@CloudSwitch.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, stefanha@redhat.com, pbonzini@redhat.com, afaerber@suse.de Signed-off-by: Igor Mammedov Acked-by: Andreas F=C3=A4rber --- v2: - replaced "if (error_is_set(&error))" with "if (error)" --- target-i386/helper.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index 2ee7c6d..81e0f31 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1243,6 +1243,7 @@ X86CPU *cpu_x86_init(const char *cpu_model) { X86CPU *cpu; CPUX86State *env; + Error *error =3D NULL; =20 cpu =3D X86_CPU(object_new(TYPE_X86_CPU)); env =3D &cpu->env; @@ -1253,8 +1254,12 @@ X86CPU *cpu_x86_init(const char *cpu_model) return NULL; } =20 - x86_cpu_realize(OBJECT(cpu), NULL); - + x86_cpu_realize(OBJECT(cpu), &error); + if (error) { + error_free(error); + object_delete(OBJECT(cpu)); + return NULL; + } return cpu; } =20 --=20 1.7.11.7