Re: [PATCH v3 6/6] target/ppc: Remove pointless checks of CONFIG_USER_ONLY in 'kvm_ppc.h'

[Cédric Le Goater]

On 6/27/23 13:51, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


I guess the MemoryRegion code has sufficiently changed since commit
98efaf75282a ("ppc: Fix up usermode only builds") ?

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.




> ---
>   target/ppc/kvm_ppc.h | 5 -----
>   1 file changed, 5 deletions(-)
>
> diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
> index 901e188c9a..6a4dd9c560 100644
> --- a/target/ppc/kvm_ppc.h
> +++ b/target/ppc/kvm_ppc.h
> @@ -42,7 +42,6 @@ int kvmppc_booke_watchdog_enable(PowerPCCPU *cpu);
>   target_ulong kvmppc_configure_v3_mmu(PowerPCCPU *cpu,
>                                        bool radix, bool gtse,
>                                        uint64_t proc_tbl);
> -#ifndef CONFIG_USER_ONLY
>   bool kvmppc_spapr_use_multitce(void);
>   int kvmppc_spapr_enable_inkernel_multitce(void);
>   void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t page_shift,
> @@ -52,7 +51,6 @@ int kvmppc_remove_spapr_tce(void *table, int pfd, uint32_t 
> window_size);
>   int kvmppc_reset_htab(int shift_hint);
>   uint64_t kvmppc_vrma_limit(unsigned int hash_shift);
>   bool kvmppc_has_cap_spapr_vfio(void);
> -#endif /* !CONFIG_USER_ONLY */
>   bool kvmppc_has_cap_epr(void);
>   int kvmppc_define_rtas_kernel_token(uint32_t token, const char *function);
>   int kvmppc_get_htab_fd(bool write, uint64_t index, Error **errp);
> @@ -262,7 +260,6 @@ static inline void kvmppc_set_reg_tb_offset(PowerPCCPU 
> *cpu, int64_t tb_offset)
>   {
>   }
>   
> -#ifndef CONFIG_USER_ONLY
>   static inline bool kvmppc_spapr_use_multitce(void)
>   {
>       return false;
> @@ -322,8 +319,6 @@ static inline void kvmppc_write_hpte(hwaddr ptex, uint64_t 
> pte0, uint64_t pte1)
>       abort();
>   }
>   
> -#endif /* !CONFIG_USER_ONLY */
> -
>   static inline bool kvmppc_has_cap_epr(void)
>   {
>       return false;