| Message ID | 1453091083-13931-8-git-send-email-david@gibson.dropbear.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <david@gibson.dropbear.id.au> > --- > 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 <thuth@redhat.com>
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);
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 <david@gibson.dropbear.id.au> --- hw/ppc/spapr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)