From patchwork Mon Feb 18 09:16:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 221181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CA00F2C0040 for ; Mon, 18 Feb 2013 21:00:02 +1100 (EST) Received: from localhost ([::1]:54511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7MrD-0003GZ-Uq for incoming@patchwork.ozlabs.org; Mon, 18 Feb 2013 04:17:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7MqY-0001yy-1D for qemu-devel@nongnu.org; Mon, 18 Feb 2013 04:17:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7MqV-0003nu-Qk for qemu-devel@nongnu.org; Mon, 18 Feb 2013 04:17:13 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45023 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7MqV-0003nb-LD; Mon, 18 Feb 2013 04:17:11 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 07044A4EB7; Mon, 18 Feb 2013 10:17:11 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2013 10:16:01 +0100 Message-Id: <1361179011-7226-3-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361179011-7226-1-git-send-email-afaerber@suse.de> References: <1361179011-7226-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [Qemu-devel] [PATCH ppc-next v2 02/52] target-ppc: Update error handling in ppc_cpu_realize() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Commit fe828a4d4b7a5617cda7b24e95e327bfb71d790e added a new fatal error message while QOM realize'ification was in flight. Convert it to return an Error instead of exit()ing. Signed-off-by: Andreas Färber --- target-ppc/translate_init.c | 6 +++--- 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index a05bb7b..c28f573 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -10043,9 +10043,9 @@ static void ppc_cpu_realize(Object *obj, Error **errp) #if !defined(CONFIG_USER_ONLY) if (smp_threads > max_smt) { - fprintf(stderr, "Cannot support more than %d threads on PPC with %s\n", - max_smt, kvm_enabled() ? "KVM" : "TCG"); - exit(1); + error_setg(errp, "Cannot support more than %d threads on PPC with %s", + max_smt, kvm_enabled() ? "KVM" : "TCG"); + return; } #endif