Re: [PATCH v3 3/6] target/ppc: Move CPU QOM definitions to cpu-qom.h

[Cédric Le Goater]

On 6/27/23 13:51, Philippe Mathieu-Daudé wrote:

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>

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

Thanks,

C.

---
  target/ppc/cpu-qom.h | 5 +++++
  target/ppc/cpu.h     | 6 ------
  2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h
index 9666f54f65..c2bff349cc 100644
--- a/target/ppc/cpu-qom.h
+++ b/target/ppc/cpu-qom.h
@@ -31,6 +31,11 @@

OBJECT_DECLARE_CPU_TYPE(PowerPCCPU, PowerPCCPUClass, POWERPC_CPU) +#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU

+#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX
+#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU
+#define cpu_list ppc_cpu_list
+
  ObjectClass *ppc_cpu_class_by_name(const char *name);

typedef struct CPUArchState CPUPPCState;

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index af12c93ebc..e91e1774e5 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1468,12 +1468,6 @@ static inline uint64_t ppc_dump_gpr(CPUPPCState *env, 
int gprn)
  int ppc_dcr_read(ppc_dcr_t *dcr_env, int dcrn, uint32_t *valp);
  int ppc_dcr_write(ppc_dcr_t *dcr_env, int dcrn, uint32_t val);

-#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU

-#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX
-#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU
-
-#define cpu_list ppc_cpu_list
-
  /* MMU modes definitions */
  #define MMU_USER_IDX 0
  static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch)