Re: [Qemu-devel] [PATCH 06/50] target-arm: make cpu-qom.h not target specific

["Alex Bennée" <alex.bennee@linaro.org>]

Paolo Bonzini <pbonzini@redhat.com> writes:

> Make ARMCPU an opaque type within cpu-qom.h, and move all definitions of
> private methods, as well as all type definitions that require knowledge
> of the layout to cpu.h.  This helps making files independent of NEED_CPU_H
> if they only need to pass around CPU pointers.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  target-arm/cpu-qom.h | 178 +-------------------------------------------------
>  target-arm/cpu.h     | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 179 insertions(+), 178 deletions(-)
>
> diff --git a/target-arm/cpu-qom.h b/target-arm/cpu-qom.h
> index 1061c08..3991173 100644
> --- a/target-arm/cpu-qom.h
> +++ b/target-arm/cpu-qom.h
> @@ -22,6 +22,8 @@
>
>  #include "qom/cpu.h"
>
> +struct arm_boot_info;
> +
>  #define TYPE_ARM_CPU "arm-cpu"
>
>  #define ARM_CPU_CLASS(klass) \
> @@ -47,145 +49,7 @@ typedef struct ARMCPUClass {
>      void (*parent_reset)(CPUState *cpu);
>  } ARMCPUClass;
>
> -/**
> - * ARMCPU:
> - * @env: #CPUARMState
> - *
> - * An ARM CPU core.
> - */
> -typedef struct ARMCPU {
> -    /*< private >*/
> -    CPUState parent_obj;
> -    /*< public >*/
> -
> -    CPUARMState env;
> -
> -    /* Coprocessor information */
> -    GHashTable *cp_regs;
> -    /* For marshalling (mostly coprocessor) register state between the
> -     * kernel and QEMU (for KVM) and between two QEMUs (for migration),
> -     * we use these arrays.
> -     */
> -    /* List of register indexes managed via these arrays; (full KVM style
> -     * 64 bit indexes, not CPRegInfo 32 bit indexes)
> -     */
> -    uint64_t *cpreg_indexes;
> -    /* Values of the registers (cpreg_indexes[i]'s value is cpreg_values[i]) */
> -    uint64_t *cpreg_values;
> -    /* Length of the indexes, values, reset_values arrays */
> -    int32_t cpreg_array_len;
> -    /* These are used only for migration: incoming data arrives in
> -     * these fields and is sanity checked in post_load before copying
> -     * to the working data structures above.
> -     */
> -    uint64_t *cpreg_vmstate_indexes;
> -    uint64_t *cpreg_vmstate_values;
> -    int32_t cpreg_vmstate_array_len;
> -
> -    /* Timers used by the generic (architected) timer */
> -    QEMUTimer *gt_timer[NUM_GTIMERS];
> -    /* GPIO outputs for generic timer */
> -    qemu_irq gt_timer_outputs[NUM_GTIMERS];
> -
> -    /* MemoryRegion to use for secure physical accesses */
> -    MemoryRegion *secure_memory;
> -
> -    /* 'compatible' string for this CPU for Linux device trees */
> -    const char *dtb_compatible;
> -
> -    /* PSCI version for this CPU
> -     * Bits[31:16] = Major Version
> -     * Bits[15:0] = Minor Version
> -     */
> -    uint32_t psci_version;
> -
> -    /* Should CPU start in PSCI powered-off state? */
> -    bool start_powered_off;
> -    /* CPU currently in PSCI powered-off state */
> -    bool powered_off;
> -    /* CPU has security extension */
> -    bool has_el3;
> -
> -    /* CPU has memory protection unit */
> -    bool has_mpu;
> -    /* PMSAv7 MPU number of supported regions */
> -    uint32_t pmsav7_dregion;
> -
> -    /* PSCI conduit used to invoke PSCI methods
> -     * 0 - disabled, 1 - smc, 2 - hvc
> -     */
> -    uint32_t psci_conduit;
> -
> -    /* [QEMU_]KVM_ARM_TARGET_* constant for this CPU, or
> -     * QEMU_KVM_ARM_TARGET_NONE if the kernel doesn't support this CPU type.
> -     */
> -    uint32_t kvm_target;
> -
> -    /* KVM init features for this CPU */
> -    uint32_t kvm_init_features[7];
> -
> -    /* Uniprocessor system with MP extensions */
> -    bool mp_is_up;
> -
> -    /* The instance init functions for implementation-specific subclasses
> -     * set these fields to specify the implementation-dependent values of
> -     * various constant registers and reset values of non-constant
> -     * registers.
> -     * Some of these might become QOM properties eventually.
> -     * Field names match the official register names as defined in the
> -     * ARMv7AR ARM Architecture Reference Manual. A reset_ prefix
> -     * is used for reset values of non-constant registers; no reset_
> -     * prefix means a constant register.
> -     */
> -    uint32_t midr;
> -    uint32_t revidr;
> -    uint32_t reset_fpsid;
> -    uint32_t mvfr0;
> -    uint32_t mvfr1;
> -    uint32_t mvfr2;
> -    uint32_t ctr;
> -    uint32_t reset_sctlr;
> -    uint32_t id_pfr0;
> -    uint32_t id_pfr1;
> -    uint32_t id_dfr0;
> -    uint32_t pmceid0;
> -    uint32_t pmceid1;
> -    uint32_t id_afr0;
> -    uint32_t id_mmfr0;
> -    uint32_t id_mmfr1;
> -    uint32_t id_mmfr2;
> -    uint32_t id_mmfr3;
> -    uint32_t id_mmfr4;
> -    uint32_t id_isar0;
> -    uint32_t id_isar1;
> -    uint32_t id_isar2;
> -    uint32_t id_isar3;
> -    uint32_t id_isar4;
> -    uint32_t id_isar5;
> -    uint64_t id_aa64pfr0;
> -    uint64_t id_aa64pfr1;
> -    uint64_t id_aa64dfr0;
> -    uint64_t id_aa64dfr1;
> -    uint64_t id_aa64afr0;
> -    uint64_t id_aa64afr1;
> -    uint64_t id_aa64isar0;
> -    uint64_t id_aa64isar1;
> -    uint64_t id_aa64mmfr0;
> -    uint64_t id_aa64mmfr1;
> -    uint32_t dbgdidr;
> -    uint32_t clidr;
> -    uint64_t mp_affinity; /* MP ID without feature bits */
> -    /* The elements of this array are the CCSIDR values for each cache,
> -     * in the order L1DCache, L1ICache, L2DCache, L2ICache, etc.
> -     */
> -    uint32_t ccsidr[16];
> -    uint64_t reset_cbar;
> -    uint32_t reset_auxcr;
> -    bool reset_hivecs;
> -    /* DCZ blocksize, in log_2(words), ie low 4 bits of DCZID_EL0 */
> -    uint32_t dcz_blocksize;
> -    uint64_t rvbar;
> -} ARMCPU;
> +typedef struct ARMCPU ARMCPU;
>
>  #define TYPE_AARCH64_CPU "aarch64-cpu"
>  #define AARCH64_CPU_CLASS(klass) \
> @@ -199,40 +63,9 @@ typedef struct AArch64CPUClass {
>      /*< public >*/
>  } AArch64CPUClass;
>
> -static inline ARMCPU *arm_env_get_cpu(CPUARMState *env)
> -{
> -    return container_of(env, ARMCPU, env);
> -}
> -
> -#define ENV_GET_CPU(e) CPU(arm_env_get_cpu(e))
> -
> -#define ENV_OFFSET offsetof(ARMCPU, env)
> -
> -#ifndef CONFIG_USER_ONLY
> -extern const struct VMStateDescription vmstate_arm_cpu;
> -#endif
> -
>  void register_cp_regs_for_features(ARMCPU *cpu);
>  void init_cpreg_list(ARMCPU *cpu);
>
> -void arm_cpu_do_interrupt(CPUState *cpu);
> -void arm_v7m_cpu_do_interrupt(CPUState *cpu);
> -bool arm_cpu_exec_interrupt(CPUState *cpu, int int_req);
> -
> -void arm_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,
> -                        int flags);
> -
> -hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cpu, vaddr addr,
> -                                         MemTxAttrs *attrs);
> -
> -int arm_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
> -int arm_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
> -
> -int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
> -                             int cpuid, void *opaque);
> -int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
> -                             int cpuid, void *opaque);
> -
>  /* Callback functions for the generic timer's timers. */
>  void arm_gt_ptimer_cb(void *opaque);
>  void arm_gt_vtimer_cb(void *opaque);
> @@ -252,9 +85,4 @@ void arm_gt_stimer_cb(void *opaque);
>  #define ARM64_AFFINITY_MASK \
>      (ARM_AFF0_MASK|ARM_AFF1_MASK|ARM_AFF2_MASK|ARM_AFF3_MASK)
>
> -#ifdef TARGET_AARCH64
> -int aarch64_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
> -int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
> -#endif
> -
>  #endif
> diff --git a/target-arm/cpu.h b/target-arm/cpu.h
> index 066ff67..bf6904c 100644
> --- a/target-arm/cpu.h
> +++ b/target-arm/cpu.h
> @@ -34,6 +34,7 @@
>  #define CPUArchState struct CPUARMState
>
>  #include "qemu-common.h"
> +#include "cpu-qom.h"
>  #include "exec/cpu-defs.h"
>
>  #include "fpu/softfloat.h"
> @@ -91,8 +92,6 @@
>  #define ARM_CPU_VIRQ 2
>  #define ARM_CPU_VFIQ 3
>
> -struct arm_boot_info;
> -
>  #define NB_MMU_MODES 7
>  #define TARGET_INSN_START_EXTRA_WORDS 1
>
> @@ -504,7 +503,181 @@ typedef struct CPUARMState {
>      const struct arm_boot_info *boot_info;
>  } CPUARMState;
>
> -#include "cpu-qom.h"
> +/**
> + * ARMCPU:
> + * @env: #CPUARMState
> + *
> + * An ARM CPU core.
> + */
> +struct ARMCPU {
> +    /*< private >*/
> +    CPUState parent_obj;
> +    /*< public >*/
> +
> +    CPUARMState env;
> +
> +    /* Coprocessor information */
> +    GHashTable *cp_regs;
> +    /* For marshalling (mostly coprocessor) register state between the
> +     * kernel and QEMU (for KVM) and between two QEMUs (for migration),
> +     * we use these arrays.
> +     */
> +    /* List of register indexes managed via these arrays; (full KVM style
> +     * 64 bit indexes, not CPRegInfo 32 bit indexes)
> +     */
> +    uint64_t *cpreg_indexes;
> +    /* Values of the registers (cpreg_indexes[i]'s value is cpreg_values[i]) */
> +    uint64_t *cpreg_values;
> +    /* Length of the indexes, values, reset_values arrays */
> +    int32_t cpreg_array_len;
> +    /* These are used only for migration: incoming data arrives in
> +     * these fields and is sanity checked in post_load before copying
> +     * to the working data structures above.
> +     */
> +    uint64_t *cpreg_vmstate_indexes;
> +    uint64_t *cpreg_vmstate_values;
> +    int32_t cpreg_vmstate_array_len;
> +
> +    /* Timers used by the generic (architected) timer */
> +    QEMUTimer *gt_timer[NUM_GTIMERS];
> +    /* GPIO outputs for generic timer */
> +    qemu_irq gt_timer_outputs[NUM_GTIMERS];
> +
> +    /* MemoryRegion to use for secure physical accesses */
> +    MemoryRegion *secure_memory;
> +
> +    /* 'compatible' string for this CPU for Linux device trees */
> +    const char *dtb_compatible;
> +
> +    /* PSCI version for this CPU
> +     * Bits[31:16] = Major Version
> +     * Bits[15:0] = Minor Version
> +     */
> +    uint32_t psci_version;
> +
> +    /* Should CPU start in PSCI powered-off state? */
> +    bool start_powered_off;
> +    /* CPU currently in PSCI powered-off state */
> +    bool powered_off;
> +    /* CPU has security extension */
> +    bool has_el3;
> +
> +    /* CPU has memory protection unit */
> +    bool has_mpu;
> +    /* PMSAv7 MPU number of supported regions */
> +    uint32_t pmsav7_dregion;
> +
> +    /* PSCI conduit used to invoke PSCI methods
> +     * 0 - disabled, 1 - smc, 2 - hvc
> +     */
> +    uint32_t psci_conduit;
> +
> +    /* [QEMU_]KVM_ARM_TARGET_* constant for this CPU, or
> +     * QEMU_KVM_ARM_TARGET_NONE if the kernel doesn't support this CPU type.
> +     */
> +    uint32_t kvm_target;
> +
> +    /* KVM init features for this CPU */
> +    uint32_t kvm_init_features[7];
> +
> +    /* Uniprocessor system with MP extensions */
> +    bool mp_is_up;
> +
> +    /* The instance init functions for implementation-specific subclasses
> +     * set these fields to specify the implementation-dependent values of
> +     * various constant registers and reset values of non-constant
> +     * registers.
> +     * Some of these might become QOM properties eventually.
> +     * Field names match the official register names as defined in the
> +     * ARMv7AR ARM Architecture Reference Manual. A reset_ prefix
> +     * is used for reset values of non-constant registers; no reset_
> +     * prefix means a constant register.
> +     */
> +    uint32_t midr;
> +    uint32_t revidr;
> +    uint32_t reset_fpsid;
> +    uint32_t mvfr0;
> +    uint32_t mvfr1;
> +    uint32_t mvfr2;
> +    uint32_t ctr;
> +    uint32_t reset_sctlr;
> +    uint32_t id_pfr0;
> +    uint32_t id_pfr1;
> +    uint32_t id_dfr0;
> +    uint32_t pmceid0;
> +    uint32_t pmceid1;
> +    uint32_t id_afr0;
> +    uint32_t id_mmfr0;
> +    uint32_t id_mmfr1;
> +    uint32_t id_mmfr2;
> +    uint32_t id_mmfr3;
> +    uint32_t id_mmfr4;
> +    uint32_t id_isar0;
> +    uint32_t id_isar1;
> +    uint32_t id_isar2;
> +    uint32_t id_isar3;
> +    uint32_t id_isar4;
> +    uint32_t id_isar5;
> +    uint64_t id_aa64pfr0;
> +    uint64_t id_aa64pfr1;
> +    uint64_t id_aa64dfr0;
> +    uint64_t id_aa64dfr1;
> +    uint64_t id_aa64afr0;
> +    uint64_t id_aa64afr1;
> +    uint64_t id_aa64isar0;
> +    uint64_t id_aa64isar1;
> +    uint64_t id_aa64mmfr0;
> +    uint64_t id_aa64mmfr1;
> +    uint32_t dbgdidr;
> +    uint32_t clidr;
> +    uint64_t mp_affinity; /* MP ID without feature bits */
> +    /* The elements of this array are the CCSIDR values for each cache,
> +     * in the order L1DCache, L1ICache, L2DCache, L2ICache, etc.
> +     */
> +    uint32_t ccsidr[16];
> +    uint64_t reset_cbar;
> +    uint32_t reset_auxcr;
> +    bool reset_hivecs;
> +    /* DCZ blocksize, in log_2(words), ie low 4 bits of DCZID_EL0 */
> +    uint32_t dcz_blocksize;
> +    uint64_t rvbar;
> +};
> +
> +static inline ARMCPU *arm_env_get_cpu(CPUARMState *env)
> +{
> +    return container_of(env, ARMCPU, env);
> +}
> +
> +#define ENV_GET_CPU(e) CPU(arm_env_get_cpu(e))
> +
> +#define ENV_OFFSET offsetof(ARMCPU, env)
> +
> +#ifndef CONFIG_USER_ONLY
> +extern const struct VMStateDescription vmstate_arm_cpu;
> +#endif
> +
> +void arm_cpu_do_interrupt(CPUState *cpu);
> +void arm_v7m_cpu_do_interrupt(CPUState *cpu);
> +bool arm_cpu_exec_interrupt(CPUState *cpu, int int_req);
> +
> +void arm_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,
> +                        int flags);
> +
> +hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cpu, vaddr addr,
> +                                         MemTxAttrs *attrs);
> +
> +int arm_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
> +int arm_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
> +
> +int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
> +                             int cpuid, void *opaque);
> +int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
> +                             int cpuid, void *opaque);
> +
> +#ifdef TARGET_AARCH64
> +int aarch64_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
> +int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
> +#endif
>
>  ARMCPU *cpu_arm_init(const char *cpu_model);
>  int cpu_arm_exec(CPUState *cpu);


--
Alex Bennée