From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLNwe-0001PG-9D for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLNwb-0002k6-5U for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:04 -0500 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]:34315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLNwa-0002jn-Vy for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:01 -0500 Received: by mail-pa0-x230.google.com with SMTP id uo6so430540263pac.1 for ; Mon, 18 Jan 2016 20:31:00 -0800 (PST) References: <1453174759-22837-1-git-send-email-david@gibson.dropbear.id.au> <1453174759-22837-3-git-send-email-david@gibson.dropbear.id.au> From: Alexey Kardashevskiy Message-ID: <569DBBFF.8030104@ozlabs.ru> Date: Tue, 19 Jan 2016 15:30:55 +1100 MIME-Version: 1.0 In-Reply-To: <1453174759-22837-3-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv4 2/8] pseries: Cleanup error handling of spapr_cpu_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , armbru@redhat.com, mdroth@linux.vnet.ibm.com Cc: lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 01/19/2016 02:39 PM, David Gibson wrote: > Currently spapr_cpu_init() is hardcoded to handle any errors as fatal. > That works for now, since it's only called from initial setup where an > error here means we really can't proceed. > > However, we'll want to handle this more flexibly for cpu hotplug in future > so generalize this using the error reporting infrastructure. While we're > at it make a small cleanup in a related part of ppc_spapr_init() to use > error_report() instead of an old-style explicit fprintf(). > > Signed-off-by: David Gibson > Reviewed-by: Bharata B Rao Reviewed-by: Alexey Kardashevskiy > --- > hw/ppc/spapr.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index fa7a7f4..b7fd09a 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1617,7 +1617,8 @@ static void spapr_boot_set(void *opaque, const char *boot_device, > machine->boot_order = g_strdup(boot_device); > } > > -static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu) > +static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu, > + Error **errp) > { > CPUPPCState *env = &cpu->env; > > @@ -1635,7 +1636,13 @@ static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu) > } > > if (cpu->max_compat) { > - ppc_set_compat(cpu, cpu->max_compat, &error_fatal); > + Error *local_err = NULL; > + > + ppc_set_compat(cpu, cpu->max_compat, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > } > > xics_cpu_setup(spapr->icp, cpu); > @@ -1804,10 +1811,10 @@ static void ppc_spapr_init(MachineState *machine) > for (i = 0; i < smp_cpus; i++) { > cpu = cpu_ppc_init(machine->cpu_model); > if (cpu == NULL) { > - fprintf(stderr, "Unable to find PowerPC CPU definition\n"); > + error_report("Unable to find PowerPC CPU definition"); > exit(1); > } > - spapr_cpu_init(spapr, cpu); > + spapr_cpu_init(spapr, cpu, &error_fatal); > } > > if (kvm_enabled()) { > -- Alexey