From patchwork Fri Apr 8 20:28:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8785781 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 AE0899F71A for ; Fri, 8 Apr 2016 20:36:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFB77202EC for ; Fri, 8 Apr 2016 20:36:25 +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 428AF200FF for ; Fri, 8 Apr 2016 20:36:25 +0000 (UTC) Received: from localhost ([::1]:58105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod8i-0001BE-JN for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 16:36:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod21-0003mY-UN for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aod1z-00023K-Od for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:29 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:36458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod1z-00023C-El for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:27 -0400 Received: by mail-wm0-x241.google.com with SMTP id l6so6823674wml.3 for ; Fri, 08 Apr 2016 13:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=JqcJ1P0EsDcIMeenAf1DMKHDqSN/TME78fm1m/mYLWs=; b=LgTclavwv/OMhtnSaXS07Cir5BXbBqDQ63LJlAGOpSXl1qvHv6h0hQi80umE7T3sUJ 3OVdDL77zg86reiUllwRdwS8rqVslkWaEcH14K9FLn0THvc/QEKcyPlL9ny0ihtZjv6R JMiCvTR8bHUX5Fm573Lwqbae2kDONosW9ZhORW1HiOtCpBDBXV+ldpbAYDOjLd/5DGGg mP9+iWhUp3Q9d4nbwoaC0SOh6pz1DXX9C+KMYNcejCKVQPNsLLSDn5VNA5rr8Nifqyzi r/3JG1+H5VzKQLHzV0Y9rJL6Uu6tXzeIfjVqQPwjsAUQPrfijoKMixyzW21WeoXvnogr GuQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=JqcJ1P0EsDcIMeenAf1DMKHDqSN/TME78fm1m/mYLWs=; b=Eo8wUBZd5crqO5bleQANwEyIp+UWW4fXkAaJ5U4ny+IvJRO2liMiZIL5yeCX/4YcBO VaLtGMNTcrNzu/h9dOVC481E7GM6iCNjNgxScAKPTUWd7YkcM3YC4D/EQta5QH+LfjGx ICb8tjEEl+dxsV6Vf/X30p2FR0GmYgUMCEhGeZ6TkUZNN20RyONX1/OpgZ70DEIlrxfP xaP5FW66F+9/UTK2NlDg83Vtl58x005i9eTMetR60PeGH4gsRdfEsqLrZe71aYu8PgW8 O5wyzfcLvDpYoxu7EyvCTaX1xtgPJ7Vsm2y5X8Rn97jP7cVi3YjLq55QzNt34rMdpDIF PQ4g== X-Gm-Message-State: AD7BkJLob38jKdEiyL1setD+TRmRJOtiLeWzN5xboim7d0xSe7R23JBfLOtA2XEYOA1VtQ== X-Received: by 10.28.9.71 with SMTP id 68mr5747012wmj.33.1460147366901; Fri, 08 Apr 2016 13:29:26 -0700 (PDT) Received: from 640k.lan (94-39-141-76.adsl-ull.clienti.tiscali.it. [94.39.141.76]) by smtp.gmail.com with ESMTPSA id w10sm3849168wjz.9.2016.04.08.13.29.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Apr 2016 13:29:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 8 Apr 2016 22:28:33 +0200 Message-Id: <1460147350-7601-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1460147350-7601-1-git-send-email-pbonzini@redhat.com> References: <1460147350-7601-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH 13/50] target-ppc: do not use target_ulong in cpu-qom.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 Bring the PowerPCCPUClass handle_mmu_fault method type into line with the one in CPUState. Using vaddr also makes the cpu-qom.h file target independent. Signed-off-by: Paolo Bonzini --- target-ppc/cpu-qom.h | 3 +-- target-ppc/mmu-hash32.c | 2 +- target-ppc/mmu-hash32.h | 2 +- target-ppc/mmu-hash64.c | 2 +- target-ppc/mmu-hash64.h | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h index eb822a3..bab501f 100644 --- a/target-ppc/cpu-qom.h +++ b/target-ppc/cpu-qom.h @@ -73,8 +73,7 @@ typedef struct PowerPCCPUClass { void (*init_proc)(CPUPPCState *env); int (*check_pow)(CPUPPCState *env); #if defined(CONFIG_SOFTMMU) - int (*handle_mmu_fault)(PowerPCCPU *cpu, target_ulong eaddr, int rwx, - int mmu_idx); + int (*handle_mmu_fault)(PowerPCCPU *cpu, vaddr eaddr, int rwx, int mmu_idx); #endif bool (*interrupts_big_endian)(PowerPCCPU *cpu); } PowerPCCPUClass; diff --git a/target-ppc/mmu-hash32.c b/target-ppc/mmu-hash32.c index 39abb2f..06ce4d6 100644 --- a/target-ppc/mmu-hash32.c +++ b/target-ppc/mmu-hash32.c @@ -383,7 +383,7 @@ static hwaddr ppc_hash32_pte_raddr(target_ulong sr, ppc_hash_pte32_t pte, return (rpn & ~mask) | (eaddr & mask); } -int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, target_ulong eaddr, int rwx, +int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr, int rwx, int mmu_idx) { CPUState *cs = CPU(cpu); diff --git a/target-ppc/mmu-hash32.h b/target-ppc/mmu-hash32.h index afbb9dd..aaceacd 100644 --- a/target-ppc/mmu-hash32.h +++ b/target-ppc/mmu-hash32.h @@ -5,7 +5,7 @@ hwaddr get_pteg_offset32(PowerPCCPU *cpu, hwaddr hash); hwaddr ppc_hash32_get_phys_page_debug(PowerPCCPU *cpu, target_ulong addr); -int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, target_ulong address, int rw, +int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr address, int rw, int mmu_idx); /* diff --git a/target-ppc/mmu-hash64.c b/target-ppc/mmu-hash64.c index 72c4ab5..5184626 100644 --- a/target-ppc/mmu-hash64.c +++ b/target-ppc/mmu-hash64.c @@ -589,7 +589,7 @@ unsigned ppc_hash64_hpte_page_shift_noslb(PowerPCCPU *cpu, return 0; } -int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, target_ulong eaddr, +int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr, int rwx, int mmu_idx) { CPUState *cs = CPU(cpu); diff --git a/target-ppc/mmu-hash64.h b/target-ppc/mmu-hash64.h index 9bf8b9b..6423b9f 100644 --- a/target-ppc/mmu-hash64.h +++ b/target-ppc/mmu-hash64.h @@ -9,7 +9,7 @@ void dump_slb(FILE *f, fprintf_function cpu_fprintf, PowerPCCPU *cpu); int ppc_store_slb(PowerPCCPU *cpu, target_ulong slot, target_ulong esid, target_ulong vsid); hwaddr ppc_hash64_get_phys_page_debug(PowerPCCPU *cpu, target_ulong addr); -int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, target_ulong address, int rw, +int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr address, int rw, int mmu_idx); void ppc_hash64_store_hpte(PowerPCCPU *cpu, target_ulong index, target_ulong pte0, target_ulong pte1);