On Tue, Feb 02, 2016 at 05:14:15PM +0100, Lluís Vilanova wrote: > Signed-off-by: Lluís 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 1bb87e6..b743811 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) > > default: > /* Don't handle this size yet */ > - abort(); > + error_report_abort("Unhandled size: %d", id & KVM_REG_SIZE_MASK); > } > } > } > @@ -617,7 +617,7 @@ static void kvm_put_one_spr(CPUState *cs, uint64_t id, int spr) > > default: > /* Don't handle this size yet */ > - abort(); > + error_report_abort("Unhandled size: %d", id & KVM_REG_SIZE_MASK); > } > > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h > index 62406ce..f82582e 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__ > > +#include "qemu/error-report.h" > + > + > #define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU > > #ifdef CONFIG_KVM > @@ -215,36 +218,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(" "); Nack. The empty message report is just awful. I don't think we should feel the need to get rid of every bare abort() or assert(). -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson