From patchwork Wed May 18 16:36:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 623663 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r90NR2wF4z9t6X for ; Thu, 19 May 2016 02:42:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=vU8mtZed; dkim-atps=neutral Received: from localhost ([::1]:46055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b34Y1-0005ZX-8g for incoming@patchwork.ozlabs.org; Wed, 18 May 2016 12:42:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b34Sb-0000Pf-JJ for qemu-devel@nongnu.org; Wed, 18 May 2016 12:36:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b34SS-0000ll-IB for qemu-devel@nongnu.org; Wed, 18 May 2016 12:36:37 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b34SS-0000lf-7U for qemu-devel@nongnu.org; Wed, 18 May 2016 12:36:28 -0400 Received: by mail-wm0-x242.google.com with SMTP id n129so14298489wmn.1 for ; Wed, 18 May 2016 09:36:28 -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=546OOoiix5fDC2NuRcFxs4hw55AA7uufXJR/o72Xzn4=; b=vU8mtZedKrEqqYZ5p0vy2SlCp1TOJji3NMtiTN+Ue72LSeD+hF4rhSStwQZmhVtIrM ZU6nIQfpGr4hQKvA+cgudZYT+qxuqn8pZVz067PjVJip4W0aUzd2DjenlchYM128yPtb eBWgibADw0czdObn9hQ1gfLqbsKYXx5pjS6xifbKmJr/7ZF+ZmOuP4KPgC8ipLtth601 BgBbFFHiojfDMT1QraZIQjZX76KG6kfzFjAwVtiRebzgOUpHZ5DV8+3JW51ZbTYohxj4 NuiIKdyTBC7yjBeVRxuVVMJJeHfRRkZotzrl3dOKZSUfscdKIngPHa3I3i0fZjCh/emk oRhQ== 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=546OOoiix5fDC2NuRcFxs4hw55AA7uufXJR/o72Xzn4=; b=jL0TZ/ZP3cxz0/d0ZNP85eWmUuH6K/9n4cH7NMB/e/AIoPzBt7a1MypmCBuNy63x+N yGwddROOVOf15FkRN17tkseBOgrUJ0yNKjt3KISlhGGoiKTCwGC7c1BwVxj5WDjlneoB LS+4MJVhpQHTdNyiG6rmRhgBofR3exH9zl18mWNFFPpFxpEaxZ8IuSPWzl4bKUMmjQvs TZtKKtxyt8bFO2U4lMAvJaYwZ0xsFh12x+elYwJO74RmGuO5heaFNTWO84ddG+6aUOv0 l+zwFlD4KN1IXzHw91wrcAIIWJuxEB4RnKOda31EEpiCErCr+ueHdLPEhtggHW/byrtL Ec7Q== X-Gm-Message-State: AOPr4FWOjz1OHLyZeOPr03QzXjPn3DBceFpCKPDaTvPkkXfht8ZjOQR/y1hvqnXdGPJeSg== X-Received: by 10.195.17.166 with SMTP id gf6mr8362497wjd.124.1463589387641; Wed, 18 May 2016 09:36:27 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id j6sm9540397wjb.29.2016.05.18.09.36.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 May 2016 09:36:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 18 May 2016 18:36:16 +0200 Message-Id: <1463589381-66853-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463589381-66853-1-git-send-email-pbonzini@redhat.com> References: <1463589381-66853-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::242 Subject: [Qemu-devel] [PATCH 14/52] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Bring the PowerPCCPUClass handle_mmu_fault method type into line with the one in CPUClass. 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);