From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK32t-0000Fj-KZ for qemu-devel@nongnu.org; Fri, 15 Jan 2016 07:00:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aK32s-0002z9-9s for qemu-devel@nongnu.org; Fri, 15 Jan 2016 06:59:59 -0500 From: David Gibson Date: Fri, 15 Jan 2016 23:00:42 +1100 Message-Id: <1452859244-9500-9-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1452859244-9500-1-git-send-email-david@gibson.dropbear.id.au> References: <1452859244-9500-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 08/10] pseries: Clean up error handling in xics_system_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: armbru@redhat.com Cc: aik@ozlabs.ru, David Gibson , qemu-ppc@nongnu.org, mdroth@linux.vnet.ibm.com, qemu-devel@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. Also change the error handling from an &error_abort to &error_fatal, since this occurs during the initial machine construction and could be triggered by bad configuration rather than a program error. 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 ddca6e6..8e02ae8 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; @@ -130,7 +130,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; @@ -1815,7 +1815,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); -- 2.5.0