Re: [PATCH 05/13] target/s390x: Constify S390CPU for cpu_has_*() getters

On 8/20/26 6:47 AM, Philippe Mathieu-Daudé wrote:
> Add the const qualifier to S390CPU when the argument
> is accessed without modification.
> 
> Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
> ---
>   target/s390x/cpu.h            |  2 +-
>   target/s390x/s390x-internal.h | 12 ++++++------
>   target/s390x/interrupt.c      | 22 +++++++++++-----------
>   3 files changed, 18 insertions(+), 18 deletions(-)

Acked-by: Eric Farman <[email protected]>

> 
> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
> index f55b79ef8ac..998bbb0d7ff 100644
> --- a/target/s390x/cpu.h
> +++ b/target/s390x/cpu.h
> @@ -854,7 +854,7 @@ static inline unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu)
>       return 0;
>   }
>   #endif /* CONFIG_USER_ONLY */
> -static inline uint8_t s390_cpu_get_state(S390CPU *cpu)
> +static inline uint8_t s390_cpu_get_state(const S390CPU *cpu)
>   {
>       return cpu->env.cpu_state;
>   }
> diff --git a/target/s390x/s390x-internal.h b/target/s390x/s390x-internal.h
> index 35d1e34ef4d..54b62808d83 100644
> --- a/target/s390x/s390x-internal.h
> +++ b/target/s390x/s390x-internal.h
> @@ -334,12 +334,12 @@ void cpu_inject_clock_comparator(S390CPU *cpu);
>   void cpu_inject_cpu_timer(S390CPU *cpu);
>   void cpu_inject_emergency_signal(S390CPU *cpu, uint16_t src_cpu_addr);
>   int cpu_inject_external_call(S390CPU *cpu, uint16_t src_cpu_addr);
> -bool s390_cpu_has_io_int(S390CPU *cpu);
> -bool s390_cpu_has_ext_int(S390CPU *cpu);
> -bool s390_cpu_has_mcck_int(S390CPU *cpu);
> -bool s390_cpu_has_int(S390CPU *cpu);
> -bool s390_cpu_has_restart_int(S390CPU *cpu);
> -bool s390_cpu_has_stop_int(S390CPU *cpu);
> +bool s390_cpu_has_io_int(const S390CPU *cpu);
> +bool s390_cpu_has_ext_int(const S390CPU *cpu);
> +bool s390_cpu_has_mcck_int(const S390CPU *cpu);
> +bool s390_cpu_has_int(const S390CPU *cpu);
> +bool s390_cpu_has_restart_int(const S390CPU *cpu);
> +bool s390_cpu_has_stop_int(const S390CPU *cpu);
>   void cpu_inject_restart(S390CPU *cpu);
>   void cpu_inject_stop(S390CPU *cpu);
>   #endif /* CONFIG_USER_ONLY */
> diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c
> index 1dca835c5d8..d7e3fd45e4b 100644
> --- a/target/s390x/interrupt.c
> +++ b/target/s390x/interrupt.c
> @@ -139,10 +139,10 @@ void s390_crw_mchk(void)
>       fsc->inject_crw_mchk(fs);
>   }
>   
> -bool s390_cpu_has_mcck_int(S390CPU *cpu)
> +bool s390_cpu_has_mcck_int(const S390CPU *cpu)
>   {
>       QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic());
> -    CPUS390XState *env = &cpu->env;
> +    const CPUS390XState *env = &cpu->env;
>   
>       if (!(env->psw.mask & PSW_MASK_MCHECK)) {
>           return false;
> @@ -157,10 +157,10 @@ bool s390_cpu_has_mcck_int(S390CPU *cpu)
>       return false;
>   }
>   
> -bool s390_cpu_has_ext_int(S390CPU *cpu)
> +bool s390_cpu_has_ext_int(const S390CPU *cpu)
>   {
>       QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic());
> -    CPUS390XState *env = &cpu->env;
> +    const CPUS390XState *env = &cpu->env;
>   
>       if (!(env->psw.mask & PSW_MASK_EXT)) {
>           return false;
> @@ -199,10 +199,10 @@ bool s390_cpu_has_ext_int(S390CPU *cpu)
>       return false;
>   }
>   
> -bool s390_cpu_has_io_int(S390CPU *cpu)
> +bool s390_cpu_has_io_int(const S390CPU *cpu)
>   {
>       QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic());
> -    CPUS390XState *env = &cpu->env;
> +    const CPUS390XState *env = &cpu->env;
>   
>       if (!(env->psw.mask & PSW_MASK_IO)) {
>           return false;
> @@ -211,21 +211,21 @@ bool s390_cpu_has_io_int(S390CPU *cpu)
>       return qemu_s390_flic_has_io(flic, env->cregs[6]);
>   }
>   
> -bool s390_cpu_has_restart_int(S390CPU *cpu)
> +bool s390_cpu_has_restart_int(const S390CPU *cpu)
>   {
> -    CPUS390XState *env = &cpu->env;
> +    const CPUS390XState *env = &cpu->env;
>   
>       return env->pending_int & INTERRUPT_RESTART;
>   }
>   
> -bool s390_cpu_has_stop_int(S390CPU *cpu)
> +bool s390_cpu_has_stop_int(const S390CPU *cpu)
>   {
> -    CPUS390XState *env = &cpu->env;
> +    const CPUS390XState *env = &cpu->env;
>   
>       return env->pending_int & INTERRUPT_STOP;
>   }
>   
> -bool s390_cpu_has_int(S390CPU *cpu)
> +bool s390_cpu_has_int(const S390CPU *cpu)
>   {
>       if (!tcg_enabled()) {
>           return false;