From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOuVr-00066J-DK for qemu-devel@nongnu.org; Thu, 28 Jan 2016 16:54:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOuVq-0004qw-Ch for qemu-devel@nongnu.org; Thu, 28 Jan 2016 16:53:59 -0500 From: =?utf-8?b?TGx1w61z?= Vilanova Date: Thu, 28 Jan 2016 22:53:54 +0100 Message-Id: <145401803408.13643.5415005295979048969.stgit@localhost> In-Reply-To: <145401801194.13643.11789300006832270147.stgit@localhost> References: <145401801194.13643.11789300006832270147.stgit@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 4/5] util: [ppc] Use new error_report_abort() instead of abort() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Thomas Huth , "open list:Overall" , Stefan Hajnoczi , "Dr . David Alan Gilbert" , Alexander Graf , "open list:PowerPC" , Paolo Bonzini , Markus Armbruster Signed-off-by: Llu=C3=ADs Vilanova --- target-ppc/kvm.c | 4 ++-- target-ppc/kvm_ppc.h | 15 +++++++++------ target-ppc/mmu-hash32.c | 5 +++-- target-ppc/mmu_helper.c | 3 +-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 098a40d..e7596a2 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -587,7 +587,7 @@ static void kvm_get_one_spr(CPUState *cs, uint64_t id= , int spr) =20 default: /* Don't handle this size yet */ - abort(); + error_report_abort("Unhandled size: %d", id & KVM_REG_SIZE_M= ASK); } } } @@ -617,7 +617,7 @@ static void kvm_put_one_spr(CPUState *cs, uint64_t id= , int spr) =20 default: /* Don't handle this size yet */ - abort(); + error_report_abort("Unhandled size: %d", id & KVM_REG_SIZE_MASK)= ; } =20 ret =3D kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h index 5e1333d..07ff3fc 100644 --- a/target-ppc/kvm_ppc.h +++ b/target-ppc/kvm_ppc.h @@ -9,6 +9,9 @@ #ifndef __KVM_PPC_H__ #define __KVM_PPC_H__ =20 +#include "qemu/error-report.h" + + #define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU =20 #ifdef CONFIG_KVM @@ -220,36 +223,36 @@ static inline int kvmppc_get_htab_fd(bool write) static inline int kvmppc_save_htab(QEMUFile *f, int fd, size_t bufsize, int64_t max_ns) { - abort(); + error_report_abort(" "); } =20 static inline int kvmppc_load_htab_chunk(QEMUFile *f, int fd, uint32_t i= ndex, uint16_t n_valid, uint16_t n_in= valid) { - abort(); + error_report_abort(" "); } =20 static inline uint64_t kvmppc_hash64_read_pteg(PowerPCCPU *cpu, target_ulong pte_index) { - abort(); + error_report_abort(" "); } =20 static inline void kvmppc_hash64_free_pteg(uint64_t token) { - abort(); + error_report_abort(" "); } =20 static inline void kvmppc_hash64_write_pte(CPUPPCState *env, target_ulong pte_index, target_ulong pte0, target_ulo= ng pte1) { - abort(); + error_report_abort(" "); } =20 static inline bool kvmppc_has_cap_fixup_hcalls(void) { - abort(); + error_report_abort(" "); } =20 static inline int kvmppc_enable_hwrng(void) diff --git a/target-ppc/mmu-hash32.c b/target-ppc/mmu-hash32.c index a00ae3c..9d1cc33 100644 --- a/target-ppc/mmu-hash32.c +++ b/target-ppc/mmu-hash32.c @@ -20,6 +20,7 @@ =20 #include "cpu.h" #include "exec/helper-proto.h" +#include "qemu/error-report.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" #include "mmu-hash32.h" @@ -55,7 +56,7 @@ static int ppc_hash32_pp_prot(int key, int pp, int nx) break; =20 default: - abort(); + error_report_abort("Unhandled pp: %d", pp); } } else { switch (pp) { @@ -73,7 +74,7 @@ static int ppc_hash32_pp_prot(int key, int pp, int nx) break; =20 default: - abort(); + error_report_abort("Unhandled pp: %d", pp); } } if (nx =3D=3D 0) { diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c index 5217691..7ded975 100644 --- a/target-ppc/mmu_helper.c +++ b/target-ppc/mmu_helper.c @@ -1349,8 +1349,7 @@ static inline int check_physical(CPUPPCState *env, = mmu_ctx_t *ctx, =20 default: /* Caller's checks mean we should never get here for other model= s */ - abort(); - return -1; + error_report_abort("Unhandled MMU model: %d", env->mmu_model); } =20 return ret;