From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?b?TGx1w61z?= Vilanova Subject: [PATCH v5 3/5] util: [ppc] Use new error_report_fatal() instead of exit() Date: Thu, 28 Jan 2016 22:53:48 +0100 Message-ID: <145401802859.13643.478507499991349592.stgit@localhost> References: <145401801194.13643.11789300006832270147.stgit@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Stefan Hajnoczi , "Dr . David Alan Gilbert" , Thomas Huth , Markus Armbruster , Eric Blake , Alexander Graf , Paolo Bonzini , qemu-ppc@nongnu.org (open list:PowerPC), kvm@vger.kernel.org (open list:Overall) To: qemu-devel@nongnu.org Return-path: Received: from roura.ac.upc.edu ([147.83.33.10]:40008 "EHLO roura.ac.upc.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751769AbcA1Vxz (ORCPT ); Thu, 28 Jan 2016 16:53:55 -0500 In-Reply-To: <145401801194.13643.11789300006832270147.stgit@localhost> Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Llu=C3=ADs Vilanova --- target-ppc/kvm.c | 5 +-- target-ppc/translate.c | 7 ++-- target-ppc/translate_init.c | 80 +++++++++++++++++++++--------------= -------- 3 files changed, 44 insertions(+), 48 deletions(-) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 9940a90..098a40d 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -316,9 +316,8 @@ static long gethugepagesize(const char *mem_path) } while (ret !=3D 0 && errno =3D=3D EINTR); =20 if (ret !=3D 0) { - fprintf(stderr, "Couldn't statfs() memory path: %s\n", - strerror(errno)); - exit(1); + error_report_fatal("Couldn't statfs() memory path: %s", + strerror(errno)); } =20 #define HUGETLBFS_MAGIC 0x958458f6 diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 4be7eaa..2dfbbc2 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -11574,10 +11574,9 @@ void gen_intermediate_code(CPUPPCState *env, s= truct TranslationBlock *tb) break; } if (tcg_check_temp_count()) { - fprintf(stderr, "Opcode %02x %02x %02x (%08x) leaked tempo= raries\n", - opc1(ctx.opcode), opc2(ctx.opcode), opc3(ctx.opcod= e), - ctx.opcode); - exit(1); + error_report_fatal("Opcode %02x %02x %02x (%08x) leaked te= mporaries", + opc1(ctx.opcode), opc2(ctx.opcode), opc= 3(ctx.opcode), + ctx.opcode); } } if (tb->cflags & CF_LAST_IO) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index d7e1a4e..dc9bbd6 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -619,8 +619,8 @@ static inline void _spr_register(CPUPPCState *env, = int num, spr->oea_read !=3D NULL || spr->oea_write !=3D NULL || #endif spr->uea_read !=3D NULL || spr->uea_write !=3D NULL) { - printf("Error: Trying to register SPR %d (%03x) twice !\n", nu= m, num); - exit(1); + error_report_fatal("Error: Trying to register SPR %d (%03x) tw= ice !", + num, num); } #if defined(PPC_DEBUG_SPR) printf("*** register spr %d (%03x) %s val " TARGET_FMT_lx "\n", nu= m, num, @@ -1608,8 +1608,7 @@ static void gen_spr_BookE (CPUPPCState *env, uint= 64_t ivor_mask) for (i =3D 0; i < 64; i++) { if (ivor_mask & (1ULL << i)) { if (ivor_sprn[i] =3D=3D SPR_BOOKE_IVORxx) { - fprintf(stderr, "ERROR: IVOR %d SPR is not defined\n",= i); - exit(1); + error_report_fatal("ERROR: IVOR %d SPR is not defined"= , i); } spr_register(env, ivor_sprn[i], ivor_names[i], SPR_NOACCESS, SPR_NOACCESS, @@ -8319,14 +8318,14 @@ static void init_ppc_proc(PowerPCCPU *cpu) case POWERPC_FLAG_VRE: break; default: - fprintf(stderr, "PowerPC MSR definition inconsistency\n" - "Should define POWERPC_FLAG_SPE or POWERPC_FLAG_VR= E\n"); - exit(1); + error_report("PowerPC MSR definition inconsistency"); + error_report_fatal( + "Should define POWERPC_FLAG_SPE or POWERPC_FLAG_VRE"); } } else if (env->flags & (POWERPC_FLAG_SPE | POWERPC_FLAG_VRE)) { - fprintf(stderr, "PowerPC MSR definition inconsistency\n" - "Should not define POWERPC_FLAG_SPE nor POWERPC_FLAG_V= RE\n"); - exit(1); + error_report("PowerPC MSR definition inconsistency"); + error_report_fatal( + "Should not define POWERPC_FLAG_SPE nor POWERPC_FLAG_VRE")= ; } if (env->msr_mask & (1 << 17)) { switch (env->flags & (POWERPC_FLAG_TGPR | POWERPC_FLAG_CE)) { @@ -8334,14 +8333,14 @@ static void init_ppc_proc(PowerPCCPU *cpu) case POWERPC_FLAG_CE: break; default: - fprintf(stderr, "PowerPC MSR definition inconsistency\n" - "Should define POWERPC_FLAG_TGPR or POWERPC_FLAG_C= E\n"); - exit(1); + error_report("PowerPC MSR definition inconsistency"); + error_report_fatal( + "Should define POWERPC_FLAG_TGPR or POWERPC_FLAG_CE"); } } else if (env->flags & (POWERPC_FLAG_TGPR | POWERPC_FLAG_CE)) { - fprintf(stderr, "PowerPC MSR definition inconsistency\n" - "Should not define POWERPC_FLAG_TGPR nor POWERPC_FLAG_= CE\n"); - exit(1); + error_report("PowerPC MSR definition inconsistency"); + error_report_fatal( + "Should not define POWERPC_FLAG_TGPR nor POWERPC_FLAG_CE")= ; } if (env->msr_mask & (1 << 10)) { switch (env->flags & (POWERPC_FLAG_SE | POWERPC_FLAG_DWE | @@ -8351,17 +8350,17 @@ static void init_ppc_proc(PowerPCCPU *cpu) case POWERPC_FLAG_UBLE: break; default: - fprintf(stderr, "PowerPC MSR definition inconsistency\n" - "Should define POWERPC_FLAG_SE or POWERPC_FLAG_DWE= or " - "POWERPC_FLAG_UBLE\n"); - exit(1); + error_report("PowerPC MSR definition inconsistency"); + error_report_fatal( + "Should define POWERPC_FLAG_SE or POWERPC_FLAG_DWE or = " + "POWERPC_FLAG_UBLE"); } } else if (env->flags & (POWERPC_FLAG_SE | POWERPC_FLAG_DWE | POWERPC_FLAG_UBLE)) { - fprintf(stderr, "PowerPC MSR definition inconsistency\n" - "Should not define POWERPC_FLAG_SE nor POWERPC_FLAG_DW= E nor " - "POWERPC_FLAG_UBLE\n"); - exit(1); + error_report("PowerPC MSR definition inconsistency"); + error_report_fatal( + "Should not define POWERPC_FLAG_SE nor POWERPC_FLAG_DWE no= r " + "POWERPC_FLAG_UBLE"); } if (env->msr_mask & (1 << 9)) { switch (env->flags & (POWERPC_FLAG_BE | POWERPC_FLAG_DE)) { @@ -8369,14 +8368,14 @@ static void init_ppc_proc(PowerPCCPU *cpu) case POWERPC_FLAG_DE: break; default: - fprintf(stderr, "PowerPC MSR definition inconsistency\n" - "Should define POWERPC_FLAG_BE or POWERPC_FLAG_DE\= n"); - exit(1); + error_report("PowerPC MSR definition inconsistency"); + error_report_fatal( + "Should define POWERPC_FLAG_BE or POWERPC_FLAG_DE"); } } else if (env->flags & (POWERPC_FLAG_BE | POWERPC_FLAG_DE)) { - fprintf(stderr, "PowerPC MSR definition inconsistency\n" - "Should not define POWERPC_FLAG_BE nor POWERPC_FLAG_DE= \n"); - exit(1); + error_report("PowerPC MSR definition inconsistency"); + error_report_fatal( + "Should not define POWERPC_FLAG_BE nor POWERPC_FLAG_DE"); } if (env->msr_mask & (1 << 2)) { switch (env->flags & (POWERPC_FLAG_PX | POWERPC_FLAG_PMM)) { @@ -8384,19 +8383,19 @@ static void init_ppc_proc(PowerPCCPU *cpu) case POWERPC_FLAG_PMM: break; default: - fprintf(stderr, "PowerPC MSR definition inconsistency\n" - "Should define POWERPC_FLAG_PX or POWERPC_FLAG_PMM= \n"); - exit(1); + error_report("PowerPC MSR definition inconsistency"); + error_report_fatal( + "Should define POWERPC_FLAG_PX or POWERPC_FLAG_PMM"); } } else if (env->flags & (POWERPC_FLAG_PX | POWERPC_FLAG_PMM)) { - fprintf(stderr, "PowerPC MSR definition inconsistency\n" - "Should not define POWERPC_FLAG_PX nor POWERPC_FLAG_PM= M\n"); - exit(1); + error_report("PowerPC MSR definition inconsistency"); + error_report_fatal( + "Should not define POWERPC_FLAG_PX nor POWERPC_FLAG_PMM"); } if ((env->flags & (POWERPC_FLAG_RTC_CLK | POWERPC_FLAG_BUS_CLK)) =3D= =3D 0) { - fprintf(stderr, "PowerPC flags inconsistency\n" - "Should define the time-base and decrementer clock sou= rce\n"); - exit(1); + error_report("PowerPC flags inconsistency"); + error_report_fatal( + "Should define the time-base and decrementer clock source"= ); } /* Allocate TLBs buffer when needed */ #if !defined(CONFIG_USER_ONLY) @@ -9570,8 +9569,7 @@ static void ppc_cpu_reset(CPUState *s) #if !defined(TARGET_WORDS_BIGENDIAN) msr |=3D (target_ulong)1 << MSR_LE; /* Little-endian user mode */ if (!((env->msr_mask >> MSR_LE) & 1)) { - fprintf(stderr, "Selected CPU does not support little-endian.\= n"); - exit(1); + error_report_fatal("Selected CPU does not support little-endia= n."); } #endif #endif