From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aL63o-0000nu-OA for qemu-devel@nongnu.org; Mon, 18 Jan 2016 04:25:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aL63n-0004lY-Ov for qemu-devel@nongnu.org; Mon, 18 Jan 2016 04:25:16 -0500 References: <1453091083-13931-1-git-send-email-david@gibson.dropbear.id.au> <1453091083-13931-8-git-send-email-david@gibson.dropbear.id.au> From: Thomas Huth Message-ID: <569CAF76.7050206@redhat.com> Date: Mon, 18 Jan 2016 10:25:10 +0100 MIME-Version: 1.0 In-Reply-To: <1453091083-13931-8-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv3 7/9] pseries: Clean up error handling in xics_system_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, armbru@redhat.com Cc: lvivier@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 18.01.2016 05:24, David Gibson wrote: > 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 bb5eaa5..148ca5a 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; > @@ -1813,7 +1813,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); Reviewed-by: Thomas Huth