From patchwork Wed Mar 16 10:46:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8599301 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BAD95C0553 for ; Wed, 16 Mar 2016 11:54:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18297202A1 for ; Wed, 16 Mar 2016 11:54:51 +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 42B17201C7 for ; Wed, 16 Mar 2016 11:54:50 +0000 (UTC) Received: from localhost ([::1]:55014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag9B8-0004WY-GJ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Mar 2016 06:59:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8z1-0002tP-P7 for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag8z0-00024K-OO for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:19 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:34094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8z0-00024B-Dh for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:18 -0400 Received: by mail-wm0-x231.google.com with SMTP id p65so183584722wmp.1 for ; Wed, 16 Mar 2016 03:47:18 -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=E05svg1VjqPSMaCgXH8Z6Am/xK0DyxnBqicyhbp/+o8=; b=GlhpP1FOGEBXnn6H4P+ww2oyKUwobXMBbhHNc7c9JT8qn9O07IgIAK5BpCZuNnwCv3 5YfXJjcZUjZvbA3Kq7DMdqW5iol/blgUr7VhXn9a1juGMgyAoxlRRUt+BuqJPcyxCqvw sETrQUVW7RM1LjRZkhQ878gjHWnl87sohTG9wf/UDRg0WalsuLSFTlb/zffa/BaXIJOD jay2g7oiMGor9rZlHYI0Yj1//t/UbqMgftwei5szNStQp19prMm4saZcG5LGEZ2vCMSv UfUcMhwnD828G1OZJiWEph7+7R2ftvGrUCL/vHvJSX9xFuZLoB8cBnFCDGMa6yRvxrSC OVfg== 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=E05svg1VjqPSMaCgXH8Z6Am/xK0DyxnBqicyhbp/+o8=; b=PCNeAFGGtEePRZdmWtYDWn2tbtQ29pRrJyMwTrPlqMj2D1wgypqfk/XLlhHDFlZvk4 421z3Mxw0AuG3ZEWwwg3g60SHjRMYHGBRZFjBySoC+6Z7whtGGZwkzU+jFm0CplCO1m0 XL13Nm78yHbltJ3daC7p1z18khBRWrKnY1KV9/bI7J4xomzqa4cSq4TItN9n0r6MMqqB EJGhJLu8taGOyS3Uw6OBW8JtnQ3vo0Wt4TUWLuk8AnImqkb7sEeqKrOIhNzo8+aKUplL dZp7XHuaubEjtTJCv8yGqDTVl/5AVEcM6cBZRvPx4E3oHgScgv4OQflwrofQiedUW/QB u2DA== X-Gm-Message-State: AD7BkJLWBR2SIPjMlWJbXLFl7DKfoYijhcuvSUKpgEO/aTw2wS5LCh8uZB8nVx7RHTzxnw== X-Received: by 10.28.91.83 with SMTP id p80mr30680995wmb.48.1458125237794; Wed, 16 Mar 2016 03:47:17 -0700 (PDT) Received: from 640k.lan (94-39-161-17.adsl-ull.clienti.tiscali.it. [94.39.161.17]) by smtp.gmail.com with ESMTPSA id wr2sm2418094wjc.49.2016.03.16.03.47.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2016 03:47:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 11:46:23 +0100 Message-Id: <1458125219-131698-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> References: <1458125219-131698-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::231 Subject: [Qemu-devel] [PATCH 13/49] target-ppc: do not use target_ulong in cpu-qom.h 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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 Using vaddr 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 9c58fbf..13fb634 100644 --- a/target-ppc/mmu-hash64.c +++ b/target-ppc/mmu-hash64.c @@ -549,7 +549,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 e7d9925..d362cfb 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);