From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLNx6-0002Ck-Rt for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLNx3-000376-JL for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:32 -0500 Received: from mail-pa0-x235.google.com ([2607:f8b0:400e:c03::235]:35657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLNx3-00036F-B6 for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:29 -0500 Received: by mail-pa0-x235.google.com with SMTP id ho8so183680263pac.2 for ; Mon, 18 Jan 2016 20:31:29 -0800 (PST) References: <1453174759-22837-1-git-send-email-david@gibson.dropbear.id.au> <1453174759-22837-8-git-send-email-david@gibson.dropbear.id.au> From: Alexey Kardashevskiy Message-ID: <569DBC1C.7020206@ozlabs.ru> Date: Tue, 19 Jan 2016 15:31:24 +1100 MIME-Version: 1.0 In-Reply-To: <1453174759-22837-8-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 7/8] pseries: Clean up error reporting in ppc_spapr_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: > This function includes a number of explicit fprintf()s for errors. > Change these to use error_report() instead. > > Also replace the single exit(EXIT_FAILURE) with an explicit exit(1), since > the latter is the more usual idiom in qemu by a large margin. > > Signed-off-by: David Gibson Reviewed-by: Alexey Kardashevskiy > --- > hw/ppc/spapr.c | 23 ++++++++++++----------- > 1 file changed, 12 insertions(+), 11 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index f45be7f..3cfacb9 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1781,8 +1781,8 @@ static void ppc_spapr_init(MachineState *machine) > } > > if (spapr->rma_size > node0_size) { > - fprintf(stderr, "Error: Numa node 0 has to span the RMA (%#08"HWADDR_PRIx")\n", > - spapr->rma_size); > + error_report("Numa node 0 has to span the RMA (%#08"HWADDR_PRIx")", > + spapr->rma_size); > exit(1); > } > > @@ -1848,10 +1848,10 @@ static void ppc_spapr_init(MachineState *machine) > ram_addr_t hotplug_mem_size = machine->maxram_size - machine->ram_size; > > if (machine->ram_slots > SPAPR_MAX_RAM_SLOTS) { > - error_report("Specified number of memory slots %" PRIu64 > - " exceeds max supported %d", > + error_report("Specified number of memory slots %" > + PRIu64" exceeds max supported %d", > machine->ram_slots, SPAPR_MAX_RAM_SLOTS); > - exit(EXIT_FAILURE); > + exit(1); > } > > spapr->hotplug_memory.base = ROUND_UP(machine->ram_size, > @@ -1947,8 +1947,9 @@ static void ppc_spapr_init(MachineState *machine) > } > > if (spapr->rma_size < (MIN_RMA_SLOF << 20)) { > - fprintf(stderr, "qemu: pSeries SLOF firmware requires >= " > - "%ldM guest RMA (Real Mode Area memory)\n", MIN_RMA_SLOF); > + error_report( > + "pSeries SLOF firmware requires >= %ldM guest RMA (Real Mode Area memory)", > + MIN_RMA_SLOF); > exit(1); > } > > @@ -1964,8 +1965,8 @@ static void ppc_spapr_init(MachineState *machine) > kernel_le = kernel_size > 0; > } > if (kernel_size < 0) { > - fprintf(stderr, "qemu: error loading %s: %s\n", > - kernel_filename, load_elf_strerror(kernel_size)); > + error_report("error loading %s: %s", > + kernel_filename, load_elf_strerror(kernel_size)); > exit(1); > } > > @@ -1978,8 +1979,8 @@ static void ppc_spapr_init(MachineState *machine) > initrd_size = load_image_targphys(initrd_filename, initrd_base, > load_limit - initrd_base); > if (initrd_size < 0) { > - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", > - initrd_filename); > + error_report("could not load initial ram disk '%s'", > + initrd_filename); > exit(1); > } > } else { > -- Alexey