qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: Fabiano Rosas <farosas@linux.ibm.com>
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, groug@kaod.org
Subject: Re: [PATCH 1/3] target/ppc: Fix compilation with DUMP_PAGE_TABLES debug option
Date: Sat, 3 Jul 2021 17:29:22 +1000	[thread overview]
Message-ID: <YOAR0mOS6tZCnKZI@yekko> (raw)
In-Reply-To: <20210702215235.1941771-2-farosas@linux.ibm.com>

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

  reply	other threads:[~2021-07-03  7:49 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-02 21:52 [PATCH 0/3] target/ppc: MMU debug fixes Fabiano Rosas
2021-07-02 21:52 ` [PATCH 1/3] target/ppc: Fix compilation with DUMP_PAGE_TABLES debug option Fabiano Rosas
2021-07-03  7:29   ` David Gibson [this message]
2021-07-02 21:52 ` [PATCH 2/3] target/ppc: Fix compilation with FLUSH_ALL_TLBS " Fabiano Rosas
2021-07-03  7:31   ` David Gibson
2021-07-02 21:52 ` [PATCH 3/3] target/ppc: Fix compilation with DEBUG_BATS " Fabiano Rosas
2021-07-03  7:32   ` David Gibson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YOAR0mOS6tZCnKZI@yekko \
    --to=david@gibson.dropbear.id.au \
    --cc=farosas@linux.ibm.com \
    --cc=groug@kaod.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).