Re: [PATCH 1/3] target/ppc: Fix compilation with DUMP_PAGE_TABLES debug option

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 1749 bytes --]

On Fri, Jul 02, 2021 at 06:52:33PM -0300, Fabiano Rosas wrote:
> ../target/ppc/mmu_helper.c: In function 'get_segment_6xx_tlb':
> ../target/ppc/mmu_helper.c:514:46: error: passing argument 1 of
> 'ppc_hash32_hpt_mask' from incompatible pointer type [-Werror=incompatible-pointer-types]
> 
>   514 |                          ppc_hash32_hpt_mask(env) + 0x80);
>       |                                              ^~~
>       |                                              |
>       |                                              CPUPPCState *
> 
> Fixes: 36778660d7 ("target/ppc: Eliminate htab_base and htab_mask variables")
> Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>

Applied to ppc-for-6.1, thanks.

> ---
>  target/ppc/mmu_helper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c
> index 1ecb36e85a..ff2c6bdd8c 100644
> --- a/target/ppc/mmu_helper.c
> +++ b/target/ppc/mmu_helper.c
> @@ -511,7 +511,7 @@ static int get_segment_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx,
>  
>                  qemu_log("Page table: " TARGET_FMT_plx " len " TARGET_FMT_plx
>                           "\n", ppc_hash32_hpt_base(cpu),
> -                         ppc_hash32_hpt_mask(env) + 0x80);
> +                         ppc_hash32_hpt_mask(cpu) + 0x80);
>                  for (curaddr = ppc_hash32_hpt_base(cpu);
>                       curaddr < (ppc_hash32_hpt_base(cpu)
>                                  + ppc_hash32_hpt_mask(cpu) + 0x80);

-- 
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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]