Re: [PATCH] target/ppc: Fix build warnings when building with 'disable-tcg'

[Daniel Henrique Barboza]

Queued in gitlab.com/danielhb/qemu/tree/ppc-next with the following tags:


    Reported-by: Kowshik Jois B S <kowsjois@linux.ibm.com>
    Fixes: 61bd1d2942 ("target/ppc: Convert to tcg_ops restore_state_to_opc")
    Fixes: 670f1da374 ("target/ppc: Implement hashst and hashchk")
    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/377
    Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
    Reviewed-by: Greg Kurz <groug@kaod.org>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Tested-by: Kowshik Jois B S <kowsjois@linux.vnet.ibm.com>


Thanks,


Daniel

On 11/16/22 10:17, Vaibhav Jain wrote:
> Kowshik reported that building qemu with GCC 12.2.1 for 'ppc64-softmmu'
> target is failing due to following build warnings:
>
> <snip>
>   ../target/ppc/cpu_init.c:7018:13: error: 'ppc_restore_state_to_opc' defined 
> but not used [-Werror=unused-function]
>   7018 | static void ppc_restore_state_to_opc(CPUState *cs,
> <snip>
>
> Fix this by wrapping these function definitions in 'ifdef CONFIG_TCG' so that
> they are only defined if qemu is compiled with '--enable-tcg'
>
> Reported-by: Kowshik Jois B S <kowsjois@linux.ibm.com>
> Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
> ---
>   target/ppc/cpu_init.c    | 2 ++
>   target/ppc/excp_helper.c | 2 ++
>   2 files changed, 4 insertions(+)
>
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 32e94153d1..cbf0081374 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -7015,6 +7015,7 @@ static vaddr ppc_cpu_get_pc(CPUState *cs)
>       return cpu->env.nip;
>   }
>   
> +#ifdef CONFIG_TCG
>   static void ppc_restore_state_to_opc(CPUState *cs,
>                                        const TranslationBlock *tb,
>                                        const uint64_t *data)
> @@ -7023,6 +7024,7 @@ static void ppc_restore_state_to_opc(CPUState *cs,
>   
>       cpu->env.nip = data[0];
>   }
> +#endif /* CONFIG_TCG */
>   
>   static bool ppc_cpu_has_work(CPUState *cs)
>   {
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index a05a2ed595..94adcb766b 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -2842,6 +2842,7 @@ void helper_td(CPUPPCState *env, target_ulong arg1, 
> target_ulong arg2,
>   #endif
>   #endif
>   
> +#ifdef CONFIG_TCG
>   static uint32_t helper_SIMON_LIKE_32_64(uint32_t x, uint64_t key, uint32_t 
> lane)
>   {
>       const uint16_t c = 0xfffc;
> @@ -2924,6 +2925,7 @@ HELPER_HASH(HASHST, env->spr[SPR_HASHKEYR], true)
>   HELPER_HASH(HASHCHK, env->spr[SPR_HASHKEYR], false)
>   HELPER_HASH(HASHSTP, env->spr[SPR_HASHPKEYR], true)
>   HELPER_HASH(HASHCHKP, env->spr[SPR_HASHPKEYR], false)
> +#endif /* CONFIG_TCG */
>   
>   #if !defined(CONFIG_USER_ONLY)
>