Re: [PATCH 4/4] target/s390x/cpu: Restrict CPUS390XState declaration to 'cpu.h'

[Zhao Liu]

On Mon, Nov 06, 2023 at 12:44:59PM +0100, Philippe Mathieu-Daudé wrote:
> Date: Mon,  6 Nov 2023 12:44:59 +0100
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
> Subject: [PATCH 4/4] target/s390x/cpu: Restrict CPUS390XState declaration
>  to 'cpu.h'
> X-Mailer: git-send-email 2.41.0
> 
> "target/s390x/cpu-qom.h" has to be target-agnostic. However, it
> currently declares CPUS390XState, which is target-specific.
> Move that declaration to "cpu.h".
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  target/s390x/cpu-qom.h | 2 --
>  target/s390x/cpu.h     | 4 ++--
>  2 files changed, 2 insertions(+), 4 deletions(-)

Sorry be late, as the response for [1],

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>

[1]: 
9b6eb677-1655-e452-2555-01eb01cf9072@linaro.org/">https://lore.kernel.org/qemu-devel/9b6eb677-1655-e452-2555-01eb01cf9072@linaro.org/

> 
> diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h
> index fcd70daddf..ccf126b7a9 100644
> --- a/target/s390x/cpu-qom.h
> +++ b/target/s390x/cpu-qom.h
> @@ -33,8 +33,6 @@ OBJECT_DECLARE_CPU_TYPE(S390CPU, S390CPUClass, S390_CPU)
>  typedef struct S390CPUModel S390CPUModel;
>  typedef struct S390CPUDef S390CPUDef;
>  
> -typedef struct CPUArchState CPUS390XState;
> -
>  typedef enum cpu_reset_type {
>      S390_CPU_RESET_NORMAL,
>      S390_CPU_RESET_INITIAL,
> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
> index 110902fa3c..942589c597 100644
> --- a/target/s390x/cpu.h
> +++ b/target/s390x/cpu.h
> @@ -55,7 +55,7 @@ typedef struct PSW {
>      uint64_t addr;
>  } PSW;
>  
> -struct CPUArchState {
> +typedef struct CPUArchState {
>      uint64_t regs[16];     /* GP registers */
>      /*
>       * The floating point registers are part of the vector registers.
> @@ -157,7 +157,7 @@ struct CPUArchState {
>      /* currently processed sigp order */
>      uint8_t sigp_order;
>  
> -};
> +} CPUS390XState;
>  
>  static inline uint64_t *get_freg(CPUS390XState *cs, int nr)
>  {
> -- 
> 2.41.0
>