From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnfD3-0002SW-An for qemu-devel@nongnu.org; Wed, 29 Apr 2015 23:32:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YnfCw-0003C7-12 for qemu-devel@nongnu.org; Wed, 29 Apr 2015 23:32:21 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:35498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnfCv-0003BC-SJ for qemu-devel@nongnu.org; Wed, 29 Apr 2015 23:32:13 -0400 Received: by pabtp1 with SMTP id tp1so46596782pab.2 for ; Wed, 29 Apr 2015 20:32:12 -0700 (PDT) Message-ID: <5541A235.8060407@ozlabs.ru> Date: Thu, 30 Apr 2015 13:32:05 +1000 From: Alexey Kardashevskiy MIME-Version: 1.0 References: <1430334068-12772-1-git-send-email-thuth@redhat.com> <1430334068-12772-3-git-send-email-thuth@redhat.com> In-Reply-To: <1430334068-12772-3-git-send-email-thuth@redhat.com> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] hw/ppc/spapr: Use error_report() instead of hw_error() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: agraf@suse.de, david@gibson.dropbear.id.au On 04/30/2015 05:01 AM, Thomas Huth wrote: > hw_error() is designed for printing CPU-related error messages > (e.g. it also prints a full CPU register dump). For error messages > that are not directly related to CPU problems, a function like > error_report() should be used instead. > > Signed-off-by: Thomas Huth > --- > hw/ppc/spapr.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 226f029..92b1c0b 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -794,8 +794,8 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr, > _FDT((fdt_pack(fdt))); > > if (fdt_totalsize(fdt) > FDT_MAX_SIZE) { > - hw_error("FDT too big ! 0x%x bytes (max is 0x%x)\n", > - fdt_totalsize(fdt), FDT_MAX_SIZE); > + error_report("FDT too big ! 0x%x bytes (max is 0x%x)", > + fdt_totalsize(fdt), FDT_MAX_SIZE); You did adjust indent here... > exit(1); > } > > @@ -1419,7 +1419,7 @@ static void ppc_spapr_init(MachineState *machine) > rma_alloc_size = kvmppc_alloc_rma(&rma); > > if (rma_alloc_size == -1) { > - hw_error("qemu: Unable to create RMA\n"); > + error_report("Unable to create RMA"); > exit(1); > } > > @@ -1520,17 +1520,17 @@ static void ppc_spapr_init(MachineState *machine) > > filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "spapr-rtas.bin"); > if (!filename) { > - hw_error("Could not find LPAR rtas '%s'\n", "spapr-rtas.bin"); > + error_report("Could not find LPAR rtas '%s'", "spapr-rtas.bin"); > exit(1); > } > spapr->rtas_size = get_image_size(filename); > spapr->rtas_blob = g_malloc(spapr->rtas_size); > if (load_image_size(filename, spapr->rtas_blob, spapr->rtas_size) < 0) { > - hw_error("qemu: could not load LPAR rtas '%s'\n", filename); > + error_report("Could not load LPAR rtas '%s'", filename); > exit(1); > } > if (spapr->rtas_size > RTAS_MAX_SIZE) { > - hw_error("RTAS too big ! 0x%zx bytes (max is 0x%x)\n", > + error_report("RTAS too big ! 0x%zx bytes (max is 0x%x)", > (size_t)spapr->rtas_size, RTAS_MAX_SIZE); ... but not here :) > exit(1); > } > -- Alexey