From patchwork Fri Dec 11 00:11:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 555411 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B2D3D140273 for ; Fri, 11 Dec 2015 11:16:17 +1100 (AEDT) Received: from localhost ([::1]:45087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7BNf-00026M-KA for incoming@patchwork.ozlabs.org; Thu, 10 Dec 2015 19:16:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7BIa-0001qp-CY for qemu-devel@nongnu.org; Thu, 10 Dec 2015 19:11:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a7BIW-0006W3-7U for qemu-devel@nongnu.org; Thu, 10 Dec 2015 19:11:00 -0500 Received: from ozlabs.org ([103.22.144.67]:55155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7BIV-0006VG-U3; Thu, 10 Dec 2015 19:10:56 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id B386A14031B; Fri, 11 Dec 2015 11:10:50 +1100 (AEDT) From: David Gibson To: armbru@redhat.com, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com Date: Fri, 11 Dec 2015 11:11:23 +1100 Message-Id: <1449792685-17000-10-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1449792685-17000-1-git-send-email-david@gibson.dropbear.id.au> References: <1449792685-17000-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Cc: lvivier@redhat.com, thuth@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 09/11] pseries: Clean up error handling in xics_system_init() 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 Use the error handling infrastructure to pass an error out from try_create_xics() instead of assuming &error_abort - the caller is in a better position to decide on error handling policy. Signed-off-by: David Gibson --- hw/ppc/spapr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 546d2f5..c376748 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -111,7 +111,7 @@ static XICSState *try_create_xics(const char *type, int nr_servers, } static XICSState *xics_system_init(MachineState *machine, - int nr_servers, int nr_irqs) + int nr_servers, int nr_irqs, Error **errp) { XICSState *icp = NULL; @@ -129,7 +129,7 @@ static XICSState *xics_system_init(MachineState *machine, } if (!icp) { - icp = try_create_xics(TYPE_XICS, nr_servers, nr_irqs, &error_abort); + icp = try_create_xics(TYPE_XICS, nr_servers, nr_irqs, errp); } return icp; @@ -1808,7 +1808,7 @@ static void ppc_spapr_init(MachineState *machine) spapr->icp = xics_system_init(machine, DIV_ROUND_UP(max_cpus * kvmppc_smt_threads(), smp_threads), - XICS_IRQS); + XICS_IRQS, &error_fatal); if (smc->dr_lmb_enabled) { spapr_validate_node_memory(machine, &error_fatal);