From patchwork Thu Jan 28 21:53:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 8154471 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 254AE9F9E8 for ; Thu, 28 Jan 2016 21:55:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 755DA20221 for ; Thu, 28 Jan 2016 21:55:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A27C720218 for ; Thu, 28 Jan 2016 21:55:43 +0000 (UTC) Received: from localhost ([::1]:58748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOuXX-0001Dg-2w for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Jan 2016 16:55:43 -0500 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 Received: from roura.ac.upc.edu ([147.83.33.10]:56479 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOuVn-0004q5-UD; Thu, 28 Jan 2016 16:53:56 -0500 Received: from gw-3.ac.upc.es (gw-3.ac.upc.es [147.83.30.9]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id u0SLrslA020576; Thu, 28 Jan 2016 22:53:54 +0100 Received: from localhost (unknown [84.88.51.85]) by gw-3.ac.upc.es (Postfix) with ESMTPSA id 717E8897; Thu, 28 Jan 2016 22:53:54 +0100 (CET) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Thu, 28 Jan 2016 22:53:54 +0100 Message-Id: <145401803408.13643.5415005295979048969.stgit@localhost> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <145401801194.13643.11789300006832270147.stgit@localhost> References: <145401801194.13643.11789300006832270147.stgit@localhost> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id u0SLrslA020576 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 147.83.33.10 Cc: Thomas Huth , "open list:Overall" , Stefan Hajnoczi , "Dr . David Alan Gilbert" , Alexander Graf , "open list:PowerPC" , Paolo Bonzini , Markus Armbruster Subject: [Qemu-devel] [PATCH v5 4/5] util: [ppc] Use new error_report_abort() instead of abort() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 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) 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 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__ +#include "qemu/error-report.h" + + #define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU #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(" "); } static inline int kvmppc_load_htab_chunk(QEMUFile *f, int fd, uint32_t index, uint16_t n_valid, uint16_t n_invalid) { - abort(); + error_report_abort(" "); } static inline uint64_t kvmppc_hash64_read_pteg(PowerPCCPU *cpu, target_ulong pte_index) { - abort(); + error_report_abort(" "); } static inline void kvmppc_hash64_free_pteg(uint64_t token) { - abort(); + error_report_abort(" "); } static inline void kvmppc_hash64_write_pte(CPUPPCState *env, target_ulong pte_index, target_ulong pte0, target_ulong pte1) { - abort(); + error_report_abort(" "); } static inline bool kvmppc_has_cap_fixup_hcalls(void) { - abort(); + error_report_abort(" "); } 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 @@ #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; 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; default: - abort(); + error_report_abort("Unhandled pp: %d", pp); } } if (nx == 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, default: /* Caller's checks mean we should never get here for other models */ - abort(); - return -1; + error_report_abort("Unhandled MMU model: %d", env->mmu_model); } return ret;